/ SGI Freeware 1999 August / SGI Freeware 1999 August.iso / dist / fw_xemacs.idb / usr / freeware / lib / xemacs-20.4 / lisp / ediff / ediff-wind.elc.z / ediff-wind.elc

MacOS 8.1

Win98

DOS

view JSON data

view as text

+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 14 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6a 75 73 74 69 6e 62 |piled by| justinb|
|00000020| 40 65 62 6f 6e 79 2e 63 | 72 61 79 2e 63 6f 6d 20 |@ebony.c|ray.com |
|00000030| 6f 6e 20 4d 6f 6e 20 4d | 61 72 20 20 39 20 31 32 |on Mon M|ar  9 12|
|00000040| 3a 34 38 3a 33 39 20 31 | 39 39 38 0a 3b 3b 3b 20 |:48:39 1|998.;;; |
|00000050| 66 72 6f 6d 20 66 69 6c | 65 20 2f 68 6f 6d 65 2f |from fil|e /home/|
|00000060| 61 73 70 65 6e 30 37 2f | 6a 75 73 74 69 6e 62 2f |aspen07/|justinb/|
|00000070| 72 6f 6f 74 73 2f 66 72 | 65 65 77 61 72 65 2f 78 |roots/fr|eeware/x|
|00000080| 65 6d 61 63 73 2f 32 30 | 2e 33 2f 78 65 6d 61 63 |emacs/20|.3/xemac|
|00000090| 73 2d 32 30 2e 33 2f 6c | 69 73 70 2f 65 64 69 66 |s-20.3/l|isp/edif|
|000000a0| 66 2f 65 64 69 66 66 2d | 77 69 6e 64 2e 65 6c 0a |f/ediff-|wind.el.|
|000000b0| 3b 3b 3b 20 65 6d 61 63 | 73 20 76 65 72 73 69 6f |;;; emac|s versio|
|000000c0| 6e 20 32 30 2e 34 20 22 | 45 6d 65 72 61 6c 64 22 |n 20.4 "|Emerald"|
|000000d0| 20 58 45 6d 61 63 73 20 | 20 4c 75 63 69 64 2e 0a | XEmacs | Lucid..|
|000000e0| 3b 3b 3b 20 62 79 74 65 | 63 6f 6d 70 20 76 65 72 |;;; byte|comp ver|
|000000f0| 73 69 6f 6e 20 32 2e 32 | 35 20 58 45 6d 61 63 73 |sion 2.2|5 XEmacs|
|00000100| 3b 20 32 32 2d 4d 61 72 | 2d 39 36 2e 0a 3b 3b 3b |; 22-Mar|-96..;;;|
|00000110| 20 6f 70 74 69 6d 69 7a | 61 74 69 6f 6e 20 69 73 | optimiz|ation is|
|00000120| 20 6f 6e 2e 0a 3b 3b 3b | 20 74 68 69 73 20 66 69 | on..;;;| this fi|
|00000130| 6c 65 20 75 73 65 73 20 | 6f 70 63 6f 64 65 73 20 |le uses |opcodes |
|00000140| 77 68 69 63 68 20 64 6f | 20 6e 6f 74 20 65 78 69 |which do| not exi|
|00000150| 73 74 20 69 6e 20 45 6d | 61 63 73 20 31 39 2e 0a |st in Em|acs 19..|
|00000160| 0a 28 69 66 20 28 61 6e | 64 20 28 62 6f 75 6e 64 |.(if (an|d (bound|
|00000170| 70 20 27 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |p 'emacs|-version|
|00000180| 29 0a 09 20 28 6f 72 20 | 28 61 6e 64 20 28 62 6f |).. (or |(and (bo|
|00000190| 75 6e 64 70 20 27 65 70 | 6f 63 68 3a 3a 76 65 72 |undp 'ep|och::ver|
|000001a0| 73 69 6f 6e 29 20 65 70 | 6f 63 68 3a 3a 76 65 72 |sion) ep|och::ver|
|000001b0| 73 69 6f 6e 29 0a 09 20 | 20 20 20 20 28 73 74 72 |sion).. |    (str|
|000001c0| 69 6e 67 2d 6c 65 73 73 | 70 20 65 6d 61 63 73 2d |ing-less|p emacs-|
|000001d0| 76 65 72 73 69 6f 6e 20 | 22 32 30 22 29 29 29 0a |version |"20"))).|
|000001e0| 20 20 20 20 28 65 72 72 | 6f 72 20 22 60 65 64 69 |    (err|or "`edi|
|000001f0| 66 66 2d 77 69 6e 64 2e | 65 6c 27 20 77 61 73 20 |ff-wind.|el' was |
|00000200| 63 6f 6d 70 69 6c 65 64 | 20 66 6f 72 20 45 6d 61 |compiled| for Ema|
|00000210| 63 73 20 32 30 22 29 29 | 0a 0a 28 6f 72 20 28 62 |cs 20"))|..(or (b|
|00000220| 6f 75 6e 64 70 20 27 63 | 75 72 72 65 6e 74 2d 6c |oundp 'c|urrent-l|
|00000230| 6f 61 64 2d 6c 69 73 74 | 29 20 28 73 65 74 71 20 |oad-list|) (setq |
|00000240| 63 75 72 72 65 6e 74 2d | 6c 6f 61 64 2d 6c 69 73 |current-|load-lis|
|00000250| 74 20 6e 69 6c 29 29 0a | 0a 0a 28 62 79 74 65 2d |t nil)).|..(byte-|
|00000260| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 0b 42 13 c4 0b |code "..|!...B...|
|00000270| 42 13 c5 0b 42 13 c6 0b | 42 13 c7 0b 42 13 c8 0b |B...B...|B...B...|
|00000280| 42 13 c9 0b 42 13 ca 0b | 42 13 cb 0b 42 13 cc 0b |B...B...|B...B...|
|00000290| 42 13 cd ce 21 88 0e 0f | ab 87 d0 d1 d2 8f 88 aa |B...!...|........|
|000002a0| 84 d3 d4 4d 88 d5 d6 d0 | d7 d8 d9 da db da dc 26 |...M....|.......&|
|000002b0| 09 87 22 20 5b 70 72 6f | 76 69 64 65 20 65 64 69 |.." [pro|vide edi|
|000002c0| 66 66 2d 77 69 6e 64 20 | 69 63 6f 6e 2d 74 69 74 |ff-wind |icon-tit|
|000002d0| 6c 65 2d 66 6f 72 6d 61 | 74 20 63 75 72 72 65 6e |le-forma|t curren|
|000002e0| 74 2d 6c 6f 61 64 2d 6c | 69 73 74 20 74 6f 70 2d |t-load-l|ist top-|
|000002f0| 74 6f 6f 6c 62 61 72 2d | 68 65 69 67 68 74 20 62 |toolbar-|height b|
|00000300| 6f 74 74 6f 6d 2d 74 6f | 6f 6c 62 61 72 2d 68 65 |ottom-to|olbar-he|
|00000310| 69 67 68 74 20 6c 65 66 | 74 2d 74 6f 6f 6c 62 61 |ight lef|t-toolba|
|00000320| 72 2d 68 65 69 67 68 74 | 20 72 69 67 68 74 2d 74 |r-height| right-t|
|00000330| 6f 6f 6c 62 61 72 2d 68 | 65 69 67 68 74 20 6c 65 |oolbar-h|eight le|
|00000340| 66 74 2d 74 6f 6f 6c 62 | 61 72 2d 77 69 64 74 68 |ft-toolb|ar-width|
|00000350| 20 72 69 67 68 74 2d 74 | 6f 6f 6c 62 61 72 2d 77 | right-t|oolbar-w|
|00000360| 69 64 74 68 20 64 65 66 | 61 75 6c 74 2d 6d 65 6e |idth def|ault-men|
|00000370| 75 62 61 72 20 66 72 61 | 6d 65 2d 69 63 6f 6e 2d |ubar fra|me-icon-|
|00000380| 74 69 74 6c 65 2d 66 6f | 72 6d 61 74 20 65 64 69 |title-fo|rmat edi|
|00000390| 66 66 2d 64 69 66 66 2d | 73 74 61 74 75 73 20 72 |ff-diff-|status r|
|000003a0| 65 71 75 69 72 65 20 65 | 64 69 66 66 2d 69 6e 69 |equire e|diff-ini|
|000003b0| 74 20 65 64 69 66 66 2d | 78 65 6d 61 63 73 2d 70 |t ediff-|xemacs-p|
|000003c0| 20 6e 69 6c 20 28 62 79 | 74 65 2d 63 6f 64 65 20 | nil (by|te-code |
|000003d0| 22 c0 c1 21 87 22 20 5b | 72 65 71 75 69 72 65 20 |"..!." [|require |
|000003e0| 65 64 69 66 66 2d 74 62 | 61 72 5d 20 32 29 20 28 |ediff-tb|ar] 2) (|
|000003f0| 28 65 72 72 6f 72 20 28 | 62 79 74 65 2d 63 6f 64 |(error (|byte-cod|
|00000400| 65 20 22 c0 c1 4d 87 22 | 20 5b 65 64 69 66 66 2d |e "..M."| [ediff-|
|00000410| 63 6f 6d 70 75 74 65 2d | 74 6f 6f 6c 62 61 72 2d |compute-|toolbar-|
|00000420| 77 69 64 74 68 20 23 5b | 6e 69 6c 20 22 c0 87 22 |width #[|nil ".."|
|00000430| 20 5b 30 5d 20 31 5d 5d | 20 32 29 29 29 20 65 64 | [0] 1]]| 2))) ed|
|00000440| 69 66 66 2d 63 6f 6d 70 | 75 74 65 2d 74 6f 6f 6c |iff-comp|ute-tool|
|00000450| 62 61 72 2d 77 69 64 74 | 68 20 23 5b 6e 69 6c 20 |bar-widt|h #[nil |
|00000460| 22 c0 87 22 20 5b 30 5d | 20 31 5d 20 63 75 73 74 |".." [0]| 1] cust|
|00000470| 6f 6d 2d 64 65 63 6c 61 | 72 65 2d 67 72 6f 75 70 |om-decla|re-group|
|00000480| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 20 22 45 | ediff-w|indow "E|
|00000490| 64 69 66 66 20 77 69 6e | 64 6f 77 20 6d 61 6e 69 |diff win|dow mani|
|000004a0| 70 75 6c 61 74 69 6f 6e | 22 20 3a 70 72 65 66 69 |pulation|" :prefi|
|000004b0| 78 20 22 65 64 69 66 66 | 2d 22 20 3a 67 72 6f 75 |x "ediff|-" :grou|
|000004c0| 70 20 65 64 69 66 66 20 | 66 72 61 6d 65 73 5d 20 |p ediff |frames] |
|000004d0| 31 30 29 0a 28 63 75 73 | 74 6f 6d 2d 64 65 63 6c |10).(cus|tom-decl|
|000004e0| 61 72 65 2d 76 61 72 69 | 61 62 6c 65 20 27 65 64 |are-vari|able 'ed|
|000004f0| 69 66 66 2d 77 69 6e 64 | 6f 77 2d 73 65 74 75 70 |iff-wind|ow-setup|
|00000500| 2d 66 75 6e 63 74 69 6f | 6e 20 27 28 69 66 20 28 |-functio|n '(if (|
|00000510| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 2d 64 69 73 |ediff-wi|ndow-dis|
|00000520| 70 6c 61 79 2d 70 29 20 | 27 65 64 69 66 66 2d 73 |play-p) |'ediff-s|
|00000530| 65 74 75 70 2d 77 69 6e | 64 6f 77 73 2d 6d 75 6c |etup-win|dows-mul|
|00000540| 74 69 66 72 61 6d 65 20 | 27 65 64 69 66 66 2d 73 |tiframe |'ediff-s|
|00000550| 65 74 75 70 2d 77 69 6e | 64 6f 77 73 2d 70 6c 61 |etup-win|dows-pla|
|00000560| 69 6e 29 20 22 2a 46 75 | 6e 63 74 69 6f 6e 20 63 |in) "*Fu|nction c|
|00000570| 61 6c 6c 65 64 20 74 6f | 20 73 65 74 20 75 70 20 |alled to| set up |
|00000580| 77 69 6e 64 6f 77 73 2e | 5c 6e 45 64 69 66 66 20 |windows.|\nEdiff |
|00000590| 70 72 6f 76 69 64 65 73 | 20 61 20 63 68 6f 69 63 |provides| a choic|
|000005a0| 65 20 6f 66 20 74 77 6f | 20 66 75 6e 63 74 69 6f |e of two| functio|
|000005b0| 6e 73 3a 20 65 64 69 66 | 66 2d 73 65 74 75 70 2d |ns: edif|f-setup-|
|000005c0| 77 69 6e 64 6f 77 73 2d | 70 6c 61 69 6e 2c 20 66 |windows-|plain, f|
|000005d0| 6f 72 5c 6e 64 6f 69 6e | 67 20 65 76 65 72 79 74 |or\ndoin|g everyt|
|000005e0| 68 69 6e 67 20 69 6e 20 | 6f 6e 65 20 66 72 61 6d |hing in |one fram|
|000005f0| 65 2c 20 61 6e 64 20 65 | 64 69 66 66 2d 73 65 74 |e, and e|diff-set|
|00000600| 75 70 2d 77 69 6e 64 6f | 77 73 2d 6d 75 6c 74 69 |up-windo|ws-multi|
|00000610| 66 72 61 6d 65 2c 5c 6e | 77 68 69 63 68 20 73 65 |frame,\n|which se|
|00000620| 74 73 20 74 68 65 20 63 | 6f 6e 74 72 6f 6c 20 70 |ts the c|ontrol p|
|00000630| 61 6e 65 6c 20 69 6e 20 | 61 20 73 65 70 61 72 61 |anel in |a separa|
|00000640| 74 65 20 66 72 61 6d 65 | 2e 20 41 6c 73 6f 2c 20 |te frame|. Also, |
|00000650| 69 66 20 74 68 65 20 6c | 61 74 74 65 72 5c 6e 66 |if the l|atter\nf|
|00000660| 75 6e 63 74 69 6f 6e 20 | 64 65 74 65 63 74 73 20 |unction |detects |
|00000670| 74 68 61 74 20 6f 6e 65 | 20 6f 66 20 74 68 65 20 |that one| of the |
|00000680| 62 75 66 66 65 72 73 20 | 41 2f 42 20 69 73 20 73 |buffers |A/B is s|
|00000690| 65 65 6e 20 69 6e 20 73 | 6f 6d 65 20 6f 74 68 65 |een in s|ome othe|
|000006a0| 72 20 66 72 61 6d 65 2c | 5c 6e 69 74 20 77 69 6c |r frame,|\nit wil|
|000006b0| 6c 20 74 72 79 20 74 6f | 20 6b 65 65 70 20 74 68 |l try to| keep th|
|000006c0| 61 74 20 62 75 66 66 65 | 72 20 69 6e 20 74 68 61 |at buffe|r in tha|
|000006d0| 74 20 66 72 61 6d 65 2e | 5c 6e 5c 6e 49 66 20 79 |t frame.|\n\nIf y|
|000006e0| 6f 75 20 64 6f 6e 27 74 | 20 6c 69 6b 65 20 74 68 |ou don't| like th|
|000006f0| 65 20 74 77 6f 20 66 75 | 6e 63 74 69 6f 6e 73 20 |e two fu|nctions |
|00000700| 70 72 6f 76 69 64 65 64 | 2d 2d 2d 77 72 69 74 65 |provided|---write|
|00000710| 20 79 6f 75 72 20 6f 77 | 6e 20 6f 6e 65 2e 5c 6e | your ow|n one.\n|
|00000720| 54 68 65 20 62 61 73 69 | 63 20 67 75 69 64 65 6c |The basi|c guidel|
|00000730| 69 6e 65 73 3a 5c 6e 20 | 20 20 20 31 2e 20 49 74 |ines:\n |   1. It|
|00000740| 20 73 68 6f 75 6c 64 20 | 6c 65 61 76 65 20 74 68 | should |leave th|
|00000750| 65 20 63 6f 6e 74 72 6f | 6c 20 62 75 66 66 65 72 |e contro|l buffer|
|00000760| 20 63 75 72 72 65 6e 74 | 20 61 6e 64 20 74 68 65 | current| and the|
|00000770| 20 63 6f 6e 74 72 6f 6c | 20 77 69 6e 64 6f 77 5c | control| window\|
|00000780| 6e 20 20 20 20 20 20 20 | 73 65 6c 65 63 74 65 64 |n       |selected|
|00000790| 2e 20 5c 6e 20 20 20 20 | 32 2e 20 49 74 20 73 68 |. \n    |2. It sh|
|000007a0| 6f 75 6c 64 20 73 65 74 | 20 65 64 69 66 66 2d 77 |ould set| ediff-w|
|000007b0| 69 6e 64 6f 77 2d 41 2c | 20 65 64 69 66 66 2d 77 |indow-A,| ediff-w|
|000007c0| 69 6e 64 6f 77 2d 42 2c | 20 65 64 69 66 66 2d 77 |indow-B,| ediff-w|
|000007d0| 69 6e 64 6f 77 2d 43 2c | 5c 6e 20 20 20 20 20 20 |indow-C,|\n      |
|000007e0| 20 61 6e 64 20 65 64 69 | 66 66 2d 63 6f 6e 74 72 | and edi|ff-contr|
|000007f0| 6f 6c 2d 77 69 6e 64 6f | 77 20 74 6f 20 63 6f 6e |ol-windo|w to con|
|00000800| 74 61 69 6e 20 77 69 6e | 64 6f 77 20 6f 62 6a 65 |tain win|dow obje|
|00000810| 63 74 73 20 74 68 61 74 | 20 64 69 73 70 6c 61 79 |cts that| display|
|00000820| 5c 6e 20 20 20 20 20 20 | 20 74 68 65 20 63 6f 72 |\n      | the cor|
|00000830| 72 65 73 70 6f 6e 64 69 | 6e 67 20 62 75 66 66 65 |respondi|ng buffe|
|00000840| 72 73 2e 5c 6e 20 20 20 | 20 33 2e 20 49 74 20 73 |rs.\n   | 3. It s|
|00000850| 68 6f 75 6c 64 20 61 63 | 63 65 70 74 20 74 68 65 |hould ac|cept the|
|00000860| 20 66 6f 6c 6c 6f 77 69 | 6e 67 20 61 72 67 75 6d | followi|ng argum|
|00000870| 65 6e 74 73 3a 5c 6e 20 | 20 20 20 20 20 20 62 75 |ents:\n |      bu|
|00000880| 66 66 65 72 2d 41 2c 20 | 62 75 66 66 65 72 2d 42 |ffer-A, |buffer-B|
|00000890| 2c 20 62 75 66 66 65 72 | 2d 43 2c 20 63 6f 6e 74 |, buffer|-C, cont|
|000008a0| 72 6f 6c 2d 62 75 66 66 | 65 72 5c 6e 20 20 20 20 |rol-buff|er\n    |
|000008b0| 20 20 20 42 75 66 66 65 | 72 20 43 20 6d 61 79 20 |   Buffe|r C may |
|000008c0| 6e 6f 74 20 62 65 20 75 | 73 65 64 20 69 6e 20 6a |not be u|sed in j|
|000008d0| 6f 62 73 20 74 68 61 74 | 20 63 6f 6d 70 61 72 65 |obs that| compare|
|000008e0| 20 6f 6e 6c 79 20 74 77 | 6f 20 62 75 66 66 65 72 | only tw|o buffer|
|000008f0| 73 2e 5c 6e 49 66 20 79 | 6f 75 20 70 6c 61 6e 20 |s.\nIf y|ou plan |
|00000900| 74 6f 20 64 6f 20 73 6f | 6d 65 74 68 69 6e 67 20 |to do so|mething |
|00000910| 66 61 6e 63 79 2c 20 74 | 61 6b 65 20 61 20 63 6c |fancy, t|ake a cl|
|00000920| 6f 73 65 20 6c 6f 6f 6b | 20 61 74 20 68 6f 77 20 |ose look| at how |
|00000930| 74 68 65 20 74 77 6f 5c | 6e 70 72 6f 76 69 64 65 |the two\|nprovide|
|00000940| 64 20 66 75 6e 63 74 69 | 6f 6e 73 20 61 72 65 20 |d functi|ons are |
|00000950| 77 72 69 74 74 65 6e 2e | 22 20 3a 74 79 70 65 20 |written.|" :type |
|00000960| 27 66 75 6e 63 74 69 6f | 6e 20 3a 67 72 6f 75 70 |'functio|n :group|
|00000970| 20 27 65 64 69 66 66 2d | 77 69 6e 64 6f 77 29 0a | 'ediff-|window).|
|00000980| 23 40 32 20 1f 0a 28 64 | 65 66 76 61 72 20 65 64 |#@2 ..(d|efvar ed|
|00000990| 69 66 66 2d 6d 75 6c 74 | 69 66 72 61 6d 65 20 6e |iff-mult|iframe n|
|000009a0| 69 6c 20 28 23 24 20 2e | 20 32 34 33 36 29 29 0a |il (#$ .| 2436)).|
|000009b0| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|000009c0| c2 c1 c3 c4 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|000009d0| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|000009e0| 63 61 6c 20 65 64 69 66 | 66 2d 6d 75 6c 74 69 66 |cal edif|f-multif|
|000009f0| 72 61 6d 65 20 70 75 74 | 20 70 65 72 6d 61 6e 65 |rame put| permane|
|00000a00| 6e 74 2d 6c 6f 63 61 6c | 20 74 5d 20 34 29 0a 23 |nt-local| t] 4).#|
|00000a10| 40 32 20 1f 0a 28 64 65 | 66 76 61 72 20 65 64 69 |@2 ..(de|fvar edi|
|00000a20| 66 66 2d 6d 65 72 67 65 | 2d 77 69 6e 64 6f 77 2d |ff-merge|-window-|
|00000a30| 73 68 61 72 65 20 30 2e | 34 35 20 28 23 24 20 2e |share 0.|45 (#$ .|
|00000a40| 20 32 35 37 39 29 29 0a | 28 62 79 74 65 2d 63 6f | 2579)).|(byte-co|
|00000a50| 64 65 20 22 c0 c1 21 88 | c2 c1 c3 c4 23 87 22 20 |de "..!.|....#." |
|00000a60| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|00000a70| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 64 69 66 |uffer-lo|cal edif|
|00000a80| 66 2d 6d 65 72 67 65 2d | 77 69 6e 64 6f 77 2d 73 |f-merge-|window-s|
|00000a90| 68 61 72 65 20 70 75 74 | 20 70 65 72 6d 61 6e 65 |hare put| permane|
|00000aa0| 6e 74 2d 6c 6f 63 61 6c | 20 74 5d 20 34 29 0a 23 |nt-local| t] 4).#|
|00000ab0| 40 32 20 1f 0a 28 64 65 | 66 76 61 72 20 65 64 69 |@2 ..(de|fvar edi|
|00000ac0| 66 66 2d 63 6f 6e 74 72 | 6f 6c 2d 77 69 6e 64 6f |ff-contr|ol-windo|
|00000ad0| 77 20 6e 69 6c 20 28 23 | 24 20 2e 20 32 37 33 39 |w nil (#|$ . 2739|
|00000ae0| 29 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |)).(byte|-code ".|
|00000af0| c1 21 88 c2 c1 c3 c4 23 | 87 22 20 5b 6d 61 6b 65 |.!.....#|." [make|
|00000b00| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|00000b10| 2d 6c 6f 63 61 6c 20 65 | 64 69 66 66 2d 63 6f 6e |-local e|diff-con|
|00000b20| 74 72 6f 6c 2d 77 69 6e | 64 6f 77 20 70 75 74 20 |trol-win|dow put |
|00000b30| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|00000b40| 74 5d 20 34 29 0a 23 40 | 32 20 1f 0a 28 64 65 66 |t] 4).#@|2 ..(def|
|00000b50| 76 61 72 20 65 64 69 66 | 66 2d 77 69 6e 64 6f 77 |var edif|f-window|
|00000b60| 2d 41 20 6e 69 6c 20 28 | 23 24 20 2e 20 32 38 39 |-A nil (|#$ . 289|
|00000b70| 30 29 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |0)).(byt|e-code "|
|00000b80| c0 c1 21 88 c2 c1 c3 c4 | 23 87 22 20 5b 6d 61 6b |..!.....|#." [mak|
|00000b90| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|00000ba0| 72 2d 6c 6f 63 61 6c 20 | 65 64 69 66 66 2d 77 69 |r-local |ediff-wi|
|00000bb0| 6e 64 6f 77 2d 41 20 70 | 75 74 20 70 65 72 6d 61 |ndow-A p|ut perma|
|00000bc0| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 74 5d 20 34 29 |nent-loc|al t] 4)|
|00000bd0| 0a 23 40 32 20 1f 0a 28 | 64 65 66 76 61 72 20 65 |.#@2 ..(|defvar e|
|00000be0| 64 69 66 66 2d 77 69 6e | 64 6f 77 2d 42 20 6e 69 |diff-win|dow-B ni|
|00000bf0| 6c 20 28 23 24 20 2e 20 | 33 30 32 39 29 29 0a 28 |l (#$ . |3029)).(|
|00000c00| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00000c10| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00000c20| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00000c30| 61 6c 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 2d |al ediff|-window-|
|00000c40| 42 20 70 75 74 20 70 65 | 72 6d 61 6e 65 6e 74 2d |B put pe|rmanent-|
|00000c50| 6c 6f 63 61 6c 20 74 5d | 20 34 29 0a 23 40 32 20 |local t]| 4).#@2 |
|00000c60| 1f 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |..(defva|r ediff-|
|00000c70| 77 69 6e 64 6f 77 2d 43 | 20 6e 69 6c 20 28 23 24 |window-C| nil (#$|
|00000c80| 20 2e 20 33 31 36 38 29 | 29 0a 28 62 79 74 65 2d | . 3168)|).(byte-|
|00000c90| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 87 |code "..|!.....#.|
|00000ca0| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00000cb0| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 64 |-buffer-|local ed|
|00000cc0| 69 66 66 2d 77 69 6e 64 | 6f 77 2d 43 20 70 75 74 |iff-wind|ow-C put|
|00000cd0| 20 70 65 72 6d 61 6e 65 | 6e 74 2d 6c 6f 63 61 6c | permane|nt-local|
|00000ce0| 20 74 5d 20 34 29 0a 23 | 40 32 20 1f 0a 28 64 65 | t] 4).#|@2 ..(de|
|00000cf0| 66 76 61 72 20 65 64 69 | 66 66 2d 77 69 6e 64 6f |fvar edi|ff-windo|
|00000d00| 77 2d 63 6f 6e 66 69 67 | 2d 73 61 76 65 64 20 22 |w-config|-saved "|
|00000d10| 22 20 28 23 24 20 2e 20 | 33 33 30 37 29 29 0a 28 |" (#$ . |3307)).(|
|00000d20| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00000d30| c1 c3 c4 23 88 c5 16 06 | c6 0e 07 42 16 07 c0 87 |...#....|...B....|
|00000d40| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00000d50| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 64 |-buffer-|local ed|
|00000d60| 69 66 66 2d 77 69 6e 64 | 6f 77 2d 63 6f 6e 66 69 |iff-wind|ow-confi|
|00000d70| 67 2d 73 61 76 65 64 20 | 70 75 74 20 70 65 72 6d |g-saved |put perm|
|00000d80| 61 6e 65 6e 74 2d 6c 6f | 63 61 6c 20 74 20 28 28 |anent-lo|cal t ((|
|00000d90| 41 20 2e 20 65 64 69 66 | 66 2d 77 69 6e 64 6f 77 |A . edif|f-window|
|00000da0| 2d 41 29 20 28 3f 41 20 | 2e 20 65 64 69 66 66 2d |-A) (?A |. ediff-|
|00000db0| 77 69 6e 64 6f 77 2d 41 | 29 20 28 42 20 2e 20 65 |window-A|) (B . e|
|00000dc0| 64 69 66 66 2d 77 69 6e | 64 6f 77 2d 42 29 20 28 |diff-win|dow-B) (|
|00000dd0| 3f 42 20 2e 20 65 64 69 | 66 66 2d 77 69 6e 64 6f |?B . edi|ff-windo|
|00000de0| 77 2d 42 29 20 28 43 20 | 2e 20 65 64 69 66 66 2d |w-B) (C |. ediff-|
|00000df0| 77 69 6e 64 6f 77 2d 43 | 29 20 28 3f 43 20 2e 20 |window-C|) (?C . |
|00000e00| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 2d 43 29 29 |ediff-wi|ndow-C))|
|00000e10| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 2d 61 6c | ediff-w|indow-al|
|00000e20| 69 73 74 20 63 75 72 72 | 65 6e 74 2d 6c 6f 61 64 |ist curr|ent-load|
|00000e30| 2d 6c 69 73 74 5d 20 34 | 29 0a 28 63 75 73 74 6f |-list] 4|).(custo|
|00000e40| 6d 2d 64 65 63 6c 61 72 | 65 2d 76 61 72 69 61 62 |m-declar|e-variab|
|00000e50| 6c 65 20 27 65 64 69 66 | 66 2d 73 70 6c 69 74 2d |le 'edif|f-split-|
|00000e60| 77 69 6e 64 6f 77 2d 66 | 75 6e 63 74 69 6f 6e 20 |window-f|unction |
|00000e70| 27 27 73 70 6c 69 74 2d | 77 69 6e 64 6f 77 2d 76 |''split-|window-v|
|00000e80| 65 72 74 69 63 61 6c 6c | 79 20 22 2a 54 68 65 20 |erticall|y "*The |
|00000e90| 66 75 6e 63 74 69 6f 6e | 20 75 73 65 64 20 74 6f |function| used to|
|00000ea0| 20 73 70 6c 69 74 20 74 | 68 65 20 6d 61 69 6e 20 | split t|he main |
|00000eb0| 77 69 6e 64 6f 77 20 62 | 65 74 77 65 65 6e 20 62 |window b|etween b|
|00000ec0| 75 66 66 65 72 2d 41 20 | 61 6e 64 20 62 75 66 66 |uffer-A |and buff|
|00000ed0| 65 72 2d 42 2e 5c 6e 59 | 6f 75 20 63 61 6e 20 73 |er-B.\nY|ou can s|
|00000ee0| 65 74 20 69 74 20 74 6f | 20 61 20 68 6f 72 69 7a |et it to| a horiz|
|00000ef0| 6f 6e 74 61 6c 20 73 70 | 6c 69 74 20 69 6e 73 74 |ontal sp|lit inst|
|00000f00| 65 61 64 20 6f 66 20 74 | 68 65 20 64 65 66 61 75 |ead of t|he defau|
|00000f10| 6c 74 20 76 65 72 74 69 | 63 61 6c 20 73 70 6c 69 |lt verti|cal spli|
|00000f20| 74 5c 6e 62 79 20 73 65 | 74 74 69 6e 67 20 74 68 |t\nby se|tting th|
|00000f30| 69 73 20 76 61 72 69 61 | 62 6c 65 20 74 6f 20 60 |is varia|ble to `|
|00000f40| 73 70 6c 69 74 2d 77 69 | 6e 64 6f 77 2d 68 6f 72 |split-wi|ndow-hor|
|00000f50| 69 7a 6f 6e 74 61 6c 6c | 79 27 2e 5c 6e 59 6f 75 |izontall|y'.\nYou|
|00000f60| 20 63 61 6e 20 61 6c 73 | 6f 20 68 61 76 65 20 79 | can als|o have y|
|00000f70| 6f 75 72 20 6f 77 6e 20 | 66 75 6e 63 74 69 6f 6e |our own |function|
|00000f80| 20 74 6f 20 64 6f 20 66 | 61 6e 63 79 20 73 70 6c | to do f|ancy spl|
|00000f90| 69 74 73 2e 5c 6e 54 68 | 69 73 20 76 61 72 69 61 |its.\nTh|is varia|
|00000fa0| 62 6c 65 20 68 61 73 20 | 6e 6f 20 65 66 66 65 63 |ble has |no effec|
|00000fb0| 74 20 77 68 65 6e 20 62 | 75 66 66 65 72 2d 41 2f |t when b|uffer-A/|
|00000fc0| 42 20 61 72 65 20 73 68 | 6f 77 6e 20 69 6e 20 64 |B are sh|own in d|
|00000fd0| 69 66 66 65 72 65 6e 74 | 20 66 72 61 6d 65 73 2e |ifferent| frames.|
|00000fe0| 5c 6e 49 6e 20 74 68 69 | 73 20 63 61 73 65 2c 20 |\nIn thi|s case, |
|00000ff0| 45 64 69 66 66 20 77 69 | 6c 6c 20 75 73 65 20 74 |Ediff wi|ll use t|
|00001000| 68 6f 73 65 20 66 72 61 | 6d 65 73 20 74 6f 20 64 |hose fra|mes to d|
|00001010| 69 73 70 6c 61 79 20 74 | 68 65 73 65 20 62 75 66 |isplay t|hese buf|
|00001020| 66 65 72 73 2e 22 20 3a | 74 79 70 65 20 27 66 75 |fers." :|type 'fu|
|00001030| 6e 63 74 69 6f 6e 20 3a | 67 72 6f 75 70 20 27 65 |nction :|group 'e|
|00001040| 64 69 66 66 2d 77 69 6e | 64 6f 77 29 0a 28 63 75 |diff-win|dow).(cu|
|00001050| 73 74 6f 6d 2d 64 65 63 | 6c 61 72 65 2d 76 61 72 |stom-dec|lare-var|
|00001060| 69 61 62 6c 65 20 27 65 | 64 69 66 66 2d 6d 65 72 |iable 'e|diff-mer|
|00001070| 67 65 2d 73 70 6c 69 74 | 2d 77 69 6e 64 6f 77 2d |ge-split|-window-|
|00001080| 66 75 6e 63 74 69 6f 6e | 20 27 27 73 70 6c 69 74 |function| ''split|
|00001090| 2d 77 69 6e 64 6f 77 2d | 68 6f 72 69 7a 6f 6e 74 |-window-|horizont|
|000010a0| 61 6c 6c 79 20 22 2a 54 | 68 65 20 66 75 6e 63 74 |ally "*T|he funct|
|000010b0| 69 6f 6e 20 75 73 65 64 | 20 74 6f 20 73 70 6c 69 |ion used| to spli|
|000010c0| 74 20 74 68 65 20 6d 61 | 69 6e 20 77 69 6e 64 6f |t the ma|in windo|
|000010d0| 77 20 62 65 74 77 65 65 | 6e 20 62 75 66 66 65 72 |w betwee|n buffer|
|000010e0| 2d 41 20 61 6e 64 20 62 | 75 66 66 65 72 2d 42 2e |-A and b|uffer-B.|
|000010f0| 5c 6e 59 6f 75 20 63 61 | 6e 20 73 65 74 20 69 74 |\nYou ca|n set it|
|00001100| 20 74 6f 20 61 20 76 65 | 72 74 69 63 61 6c 20 73 | to a ve|rtical s|
|00001110| 70 6c 69 74 20 69 6e 73 | 74 65 61 64 20 6f 66 20 |plit ins|tead of |
|00001120| 74 68 65 20 64 65 66 61 | 75 6c 74 20 68 6f 72 69 |the defa|ult hori|
|00001130| 7a 6f 6e 74 61 6c 20 73 | 70 6c 69 74 5c 6e 62 79 |zontal s|plit\nby|
|00001140| 20 73 65 74 74 69 6e 67 | 20 74 68 69 73 20 76 61 | setting| this va|
|00001150| 72 69 61 62 6c 65 20 74 | 6f 20 60 73 70 6c 69 74 |riable t|o `split|
|00001160| 2d 77 69 6e 64 6f 77 2d | 76 65 72 74 69 63 61 6c |-window-|vertical|
|00001170| 6c 79 27 2e 5c 6e 59 6f | 75 20 63 61 6e 20 61 6c |ly'.\nYo|u can al|
|00001180| 73 6f 20 68 61 76 65 20 | 79 6f 75 72 20 6f 77 6e |so have |your own|
|00001190| 20 66 75 6e 63 74 69 6f | 6e 20 74 6f 20 64 6f 20 | functio|n to do |
|000011a0| 66 61 6e 63 79 20 73 70 | 6c 69 74 73 2e 5c 6e 54 |fancy sp|lits.\nT|
|000011b0| 68 69 73 20 76 61 72 69 | 61 62 6c 65 20 68 61 73 |his vari|able has|
|000011c0| 20 6e 6f 20 65 66 66 65 | 63 74 20 77 68 65 6e 20 | no effe|ct when |
|000011d0| 62 75 66 66 65 72 2d 41 | 2f 42 2f 43 20 61 72 65 |buffer-A|/B/C are|
|000011e0| 20 73 68 6f 77 6e 20 69 | 6e 20 64 69 66 66 65 72 | shown i|n differ|
|000011f0| 65 6e 74 20 66 72 61 6d | 65 73 2e 5c 6e 49 6e 20 |ent fram|es.\nIn |
|00001200| 74 68 69 73 20 63 61 73 | 65 2c 20 45 64 69 66 66 |this cas|e, Ediff|
|00001210| 20 77 69 6c 6c 20 75 73 | 65 20 74 68 6f 73 65 20 | will us|e those |
|00001220| 66 72 61 6d 65 73 20 74 | 6f 20 64 69 73 70 6c 61 |frames t|o displa|
|00001230| 79 20 74 68 65 73 65 20 | 62 75 66 66 65 72 73 2e |y these |buffers.|
|00001240| 22 20 3a 74 79 70 65 20 | 27 66 75 6e 63 74 69 6f |" :type |'functio|
|00001250| 6e 20 3a 67 72 6f 75 70 | 20 27 65 64 69 66 66 2d |n :group| 'ediff-|
|00001260| 77 69 6e 64 6f 77 29 0a | 23 40 31 32 36 20 46 72 |window).|#@126 Fr|
|00001270| 61 6d 65 20 70 61 72 61 | 6d 65 74 65 72 73 20 66 |ame para|meters f|
|00001280| 6f 72 20 64 69 73 70 6c | 61 79 69 6e 67 20 45 64 |or displ|aying Ed|
|00001290| 69 66 66 20 43 6f 6e 74 | 72 6f 6c 20 50 61 6e 65 |iff Cont|rol Pane|
|000012a0| 6c 2e 0a 44 6f 20 6e 6f | 74 20 73 70 65 63 69 66 |l..Do no|t specif|
|000012b0| 79 20 77 69 64 74 68 20 | 61 6e 64 20 68 65 69 67 |y width |and heig|
|000012c0| 68 74 20 68 65 72 65 2e | 20 54 68 65 73 65 20 61 |ht here.| These a|
|000012d0| 72 65 20 63 6f 6d 70 75 | 74 65 64 20 61 75 74 6f |re compu|ted auto|
|000012e0| 6d 61 74 69 63 61 6c 6c | 79 2e 1f 0a 28 64 65 66 |maticall|y...(def|
|000012f0| 63 6f 6e 73 74 20 65 64 | 69 66 66 2d 63 6f 6e 74 |const ed|iff-cont|
|00001300| 72 6f 6c 2d 66 72 61 6d | 65 2d 70 61 72 61 6d 65 |rol-fram|e-parame|
|00001310| 74 65 72 73 20 28 62 79 | 74 65 2d 63 6f 64 65 20 |ters (by|te-code |
|00001320| 22 c0 c1 c2 c3 c4 c5 c6 | c7 c8 c9 ca 21 ab 85 ca |".......|....!...|
|00001330| 20 54 aa 81 cb 42 cc c9 | cd 21 ab 85 cd 20 54 aa | T...B..|.!... T.|
|00001340| 81 cb 42 af 5c 6e 87 22 | 20 5b 28 6e 61 6d 65 20 |..B.\n."| [(name |
|00001350| 2e 20 22 45 64 69 66 66 | 22 29 20 28 6d 69 6e 69 |. "Ediff|") (mini|
|00001360| 62 75 66 66 65 72 29 20 | 28 75 73 65 72 2d 70 6f |buffer) |(user-po|
|00001370| 73 69 74 69 6f 6e 20 2e | 20 74 29 20 28 76 65 72 |sition .| t) (ver|
|00001380| 74 69 63 61 6c 2d 73 63 | 72 6f 6c 6c 2d 62 61 72 |tical-sc|roll-bar|
|00001390| 73 29 20 28 73 63 72 6f | 6c 6c 62 61 72 2d 77 69 |s) (scro|llbar-wi|
|000013a0| 64 74 68 20 2e 20 30 29 | 20 28 6d 65 6e 75 2d 62 |dth . 0)| (menu-b|
|000013b0| 61 72 2d 6c 69 6e 65 73 | 20 2e 20 30 29 20 28 61 |ar-lines| . 0) (a|
|000013c0| 75 74 6f 2d 6c 6f 77 65 | 72 29 20 28 61 75 74 6f |uto-lowe|r) (auto|
|000013d0| 2d 72 61 69 73 65 20 2e | 20 74 29 20 74 6f 70 20 |-raise .| t) top |
|000013e0| 66 62 6f 75 6e 64 70 20 | 65 64 69 66 66 2d 64 69 |fboundp |ediff-di|
|000013f0| 73 70 6c 61 79 2d 70 69 | 78 65 6c 2d 68 65 69 67 |splay-pi|xel-heig|
|00001400| 68 74 20 33 30 30 30 20 | 6c 65 66 74 20 65 64 69 |ht 3000 |left edi|
|00001410| 66 66 2d 64 69 73 70 6c | 61 79 2d 70 69 78 65 6c |ff-displ|ay-pixel|
|00001420| 2d 77 69 64 74 68 5d 20 | 31 32 29 20 28 23 24 20 |-width] |12) (#$ |
|00001430| 2e 20 34 37 31 38 29 29 | 0a 23 40 32 20 1f 0a 28 |. 4718))|.#@2 ..(|
|00001440| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 6d 6f 75 |defvar e|diff-mou|
|00001450| 73 65 2d 70 69 78 65 6c | 2d 70 6f 73 69 74 69 6f |se-pixel|-positio|
|00001460| 6e 20 6e 69 6c 20 28 23 | 24 20 2e 20 35 31 38 31 |n nil (#|$ . 5181|
|00001470| 29 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |)).(byte|-code ".|
|00001480| c1 21 88 c2 c1 c3 c4 23 | 87 22 20 5b 6d 61 6b 65 |.!.....#|." [make|
|00001490| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|000014a0| 2d 6c 6f 63 61 6c 20 65 | 64 69 66 66 2d 6d 6f 75 |-local e|diff-mou|
|000014b0| 73 65 2d 70 69 78 65 6c | 2d 70 6f 73 69 74 69 6f |se-pixel|-positio|
|000014c0| 6e 20 70 75 74 20 70 65 | 72 6d 61 6e 65 6e 74 2d |n put pe|rmanent-|
|000014d0| 6c 6f 63 61 6c 20 74 5d | 20 34 29 0a 23 40 39 37 |local t]| 4).#@97|
|000014e0| 20 49 66 20 74 68 65 20 | 75 73 65 72 20 6d 6f 76 | If the |user mov|
|000014f0| 65 73 20 6d 6f 75 73 65 | 20 6d 6f 72 65 20 74 68 |es mouse| more th|
|00001500| 61 6e 20 74 68 69 73 20 | 6d 61 6e 79 20 70 69 78 |an this |many pix|
|00001510| 65 6c 73 2c 20 45 64 69 | 66 66 20 77 6f 6e 27 74 |els, Edi|ff won't|
|00001520| 20 77 61 72 70 20 6d 6f | 75 73 65 20 69 6e 74 6f | warp mo|use into|
|00001530| 20 63 6f 6e 74 72 6f 6c | 20 77 69 6e 64 6f 77 2e | control| window.|
|00001540| 1f 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |..(defva|r ediff-|
|00001550| 6d 6f 75 73 65 2d 70 69 | 78 65 6c 2d 74 68 72 65 |mouse-pi|xel-thre|
|00001560| 73 68 6f 6c 64 20 33 30 | 20 28 23 24 20 2e 20 35 |shold 30| (#$ . 5|
|00001570| 33 34 35 29 29 0a 28 63 | 75 73 74 6f 6d 2d 64 65 |345)).(c|ustom-de|
|00001580| 63 6c 61 72 65 2d 76 61 | 72 69 61 62 6c 65 20 27 |clare-va|riable '|
|00001590| 65 64 69 66 66 2d 67 72 | 61 62 2d 6d 6f 75 73 65 |ediff-gr|ab-mouse|
|000015a0| 20 27 74 20 22 2a 49 66 | 20 74 2c 20 45 64 69 66 | 't "*If| t, Edif|
|000015b0| 66 20 77 69 6c 6c 20 61 | 6c 77 61 79 73 20 67 72 |f will a|lways gr|
|000015c0| 61 62 20 74 68 65 20 6d | 6f 75 73 65 20 61 6e 64 |ab the m|ouse and|
|000015d0| 20 70 75 74 20 69 74 20 | 69 6e 20 74 68 65 20 63 | put it |in the c|
|000015e0| 6f 6e 74 72 6f 6c 20 66 | 72 61 6d 65 2e 5c 6e 49 |ontrol f|rame.\nI|
|000015f0| 66 20 27 6d 61 79 62 65 | 2c 20 45 64 69 66 66 20 |f 'maybe|, Ediff |
|00001600| 77 69 6c 6c 20 64 6f 20 | 69 74 20 73 6f 6d 65 74 |will do |it somet|
|00001610| 69 6d 65 73 2c 20 62 75 | 74 20 6e 6f 74 20 61 66 |imes, bu|t not af|
|00001620| 74 65 72 20 6f 70 65 72 | 61 74 69 6f 6e 73 20 74 |ter oper|ations t|
|00001630| 68 61 74 20 72 65 71 75 | 69 72 65 5c 6e 72 65 6c |hat requ|ire\nrel|
|00001640| 61 74 69 76 65 6c 79 20 | 6c 6f 6e 67 20 74 69 6d |atively |long tim|
|00001650| 65 2e 20 49 66 20 6e 69 | 6c 2c 20 74 68 65 20 6d |e. If ni|l, the m|
|00001660| 6f 75 73 65 20 77 69 6c | 6c 20 62 65 20 65 6e 74 |ouse wil|l be ent|
|00001670| 69 72 65 6c 79 20 75 73 | 65 72 27 73 5c 6e 72 65 |irely us|er's\nre|
|00001680| 73 70 6f 6e 73 69 62 69 | 6c 69 74 79 2e 22 20 3a |sponsibi|lity." :|
|00001690| 74 79 70 65 20 27 62 6f | 6f 6c 65 61 6e 20 3a 67 |type 'bo|olean :g|
|000016a0| 72 6f 75 70 20 27 65 64 | 69 66 66 2d 77 69 6e 64 |roup 'ed|iff-wind|
|000016b0| 6f 77 29 0a 28 63 75 73 | 74 6f 6d 2d 64 65 63 6c |ow).(cus|tom-decl|
|000016c0| 61 72 65 2d 76 61 72 69 | 61 62 6c 65 20 27 65 64 |are-vari|able 'ed|
|000016d0| 69 66 66 2d 63 6f 6e 74 | 72 6f 6c 2d 66 72 61 6d |iff-cont|rol-fram|
|000016e0| 65 2d 70 6f 73 69 74 69 | 6f 6e 2d 66 75 6e 63 74 |e-positi|on-funct|
|000016f0| 69 6f 6e 20 27 27 65 64 | 69 66 66 2d 6d 61 6b 65 |ion ''ed|iff-make|
|00001700| 2d 66 72 61 6d 65 2d 70 | 6f 73 69 74 69 6f 6e 20 |-frame-p|osition |
|00001710| 22 46 75 6e 63 74 69 6f | 6e 20 74 6f 20 63 61 6c |"Functio|n to cal|
|00001720| 6c 20 74 6f 20 64 65 74 | 65 72 6d 69 6e 65 20 74 |l to det|ermine t|
|00001730| 68 65 20 64 65 73 69 72 | 65 64 20 6c 6f 63 61 74 |he desir|ed locat|
|00001740| 69 6f 6e 20 66 6f 72 20 | 74 68 65 20 63 6f 6e 74 |ion for |the cont|
|00001750| 72 6f 6c 20 70 61 6e 65 | 6c 2e 5c 6e 45 78 70 65 |rol pane|l.\nExpe|
|00001760| 63 74 73 20 74 68 72 65 | 65 20 70 61 72 61 6d 65 |cts thre|e parame|
|00001770| 74 65 72 73 3a 20 74 68 | 65 20 63 6f 6e 74 72 6f |ters: th|e contro|
|00001780| 6c 20 62 75 66 66 65 72 | 2c 20 74 68 65 20 64 65 |l buffer|, the de|
|00001790| 73 69 72 65 64 20 77 69 | 64 74 68 20 61 6e 64 20 |sired wi|dth and |
|000017a0| 68 65 69 67 68 74 5c 6e | 6f 66 20 74 68 65 20 63 |height\n|of the c|
|000017b0| 6f 6e 74 72 6f 6c 20 66 | 72 61 6d 65 2e 20 49 74 |ontrol f|rame. It|
|000017c0| 20 72 65 74 75 72 6e 73 | 20 61 6e 20 61 73 73 6f | returns| an asso|
|000017d0| 63 69 61 74 69 6f 6e 20 | 6c 69 73 74 5c 6e 6f 66 |ciation |list\nof|
|000017e0| 20 74 68 65 20 66 6f 72 | 6d 20 28 28 74 6f 70 20 | the for|m ((top |
|000017f0| 2e 20 3c 70 6f 73 69 74 | 69 6f 6e 3e 29 20 28 6c |. <posit|ion>) (l|
|00001800| 65 66 74 20 2e 20 3c 70 | 6f 73 69 74 69 6f 6e 3e |eft . <p|osition>|
|00001810| 29 29 22 20 3a 74 79 70 | 65 20 27 66 75 6e 63 74 |))" :typ|e 'funct|
|00001820| 69 6f 6e 20 3a 67 72 6f | 75 70 20 27 65 64 69 66 |ion :gro|up 'edif|
|00001830| 66 2d 77 69 6e 64 6f 77 | 29 0a 28 63 75 73 74 6f |f-window|).(custo|
|00001840| 6d 2d 64 65 63 6c 61 72 | 65 2d 76 61 72 69 61 62 |m-declar|e-variab|
|00001850| 6c 65 20 27 65 64 69 66 | 66 2d 63 6f 6e 74 72 6f |le 'edif|f-contro|
|00001860| 6c 2d 66 72 61 6d 65 2d | 75 70 77 61 72 64 2d 73 |l-frame-|upward-s|
|00001870| 68 69 66 74 20 27 28 69 | 66 20 65 64 69 66 66 2d |hift '(i|f ediff-|
|00001880| 78 65 6d 61 63 73 2d 70 | 20 34 32 20 31 34 29 20 |xemacs-p| 42 14) |
|00001890| 22 2a 54 68 65 20 75 70 | 77 61 72 64 20 73 68 69 |"*The up|ward shi|
|000018a0| 66 74 20 6f 66 20 63 6f | 6e 74 72 6f 6c 20 66 72 |ft of co|ntrol fr|
|000018b0| 61 6d 65 20 66 72 6f 6d | 20 74 68 65 20 74 6f 70 |ame from| the top|
|000018c0| 20 6f 66 20 62 75 66 66 | 65 72 20 41 27 73 20 66 | of buff|er A's f|
|000018d0| 72 61 6d 65 2e 5c 6e 4d | 65 61 73 75 72 65 64 20 |rame.\nM|easured |
|000018e0| 69 6e 20 70 69 78 65 6c | 73 2e 5c 6e 54 68 69 73 |in pixel|s.\nThis|
|000018f0| 20 69 73 20 75 73 65 64 | 20 62 79 20 74 68 65 20 | is used| by the |
|00001900| 64 65 66 61 75 6c 74 20 | 63 6f 6e 74 72 6f 6c 20 |default |control |
|00001910| 66 72 61 6d 65 20 70 6f | 73 69 74 69 6f 6e 69 6e |frame po|sitionin|
|00001920| 67 20 66 75 6e 63 74 69 | 6f 6e 2c 5c 6e 60 65 64 |g functi|on,\n`ed|
|00001930| 69 66 66 2d 6d 61 6b 65 | 2d 66 72 61 6d 65 2d 70 |iff-make|-frame-p|
|00001940| 6f 73 69 74 69 6f 6e 27 | 2e 20 54 68 69 73 20 76 |osition'|. This v|
|00001950| 61 72 69 61 62 6c 65 20 | 69 73 20 70 72 6f 76 69 |ariable |is provi|
|00001960| 64 65 64 20 66 6f 72 20 | 65 61 73 79 5c 6e 63 75 |ded for |easy\ncu|
|00001970| 73 74 6f 6d 69 7a 61 74 | 69 6f 6e 20 6f 66 20 74 |stomizat|ion of t|
|00001980| 68 65 20 64 65 66 61 75 | 6c 74 2e 22 20 3a 74 79 |he defau|lt." :ty|
|00001990| 70 65 20 27 69 6e 74 65 | 67 65 72 20 3a 67 72 6f |pe 'inte|ger :gro|
|000019a0| 75 70 20 27 65 64 69 66 | 66 2d 77 69 6e 64 6f 77 |up 'edif|f-window|
|000019b0| 29 0a 28 63 75 73 74 6f | 6d 2d 64 65 63 6c 61 72 |).(custo|m-declar|
|000019c0| 65 2d 76 61 72 69 61 62 | 6c 65 20 27 65 64 69 66 |e-variab|le 'edif|
|000019d0| 66 2d 6e 61 72 72 6f 77 | 2d 63 6f 6e 74 72 6f 6c |f-narrow|-control|
|000019e0| 2d 66 72 61 6d 65 2d 6c | 65 66 74 77 61 72 64 2d |-frame-l|eftward-|
|000019f0| 73 68 69 66 74 20 27 28 | 69 66 20 65 64 69 66 66 |shift '(|if ediff|
|00001a00| 2d 78 65 6d 61 63 73 2d | 70 20 37 20 33 29 20 22 |-xemacs-|p 7 3) "|
|00001a10| 2a 54 68 65 20 6c 65 66 | 74 77 61 72 64 20 73 68 |*The lef|tward sh|
|00001a20| 69 66 74 20 6f 66 20 63 | 6f 6e 74 72 6f 6c 20 66 |ift of c|ontrol f|
|00001a30| 72 61 6d 65 20 66 72 6f | 6d 20 74 68 65 20 72 69 |rame fro|m the ri|
|00001a40| 67 68 74 20 65 64 67 65 | 20 6f 66 20 62 75 66 20 |ght edge| of buf |
|00001a50| 41 27 73 20 66 72 61 6d | 65 2e 5c 6e 4d 65 61 73 |A's fram|e.\nMeas|
|00001a60| 75 72 65 64 20 69 6e 20 | 63 68 61 72 61 63 74 65 |ured in |characte|
|00001a70| 72 73 2e 5c 6e 54 68 69 | 73 20 69 73 20 75 73 65 |rs.\nThi|s is use|
|00001a80| 64 20 62 79 20 74 68 65 | 20 64 65 66 61 75 6c 74 |d by the| default|
|00001a90| 20 63 6f 6e 74 72 6f 6c | 20 66 72 61 6d 65 20 70 | control| frame p|
|00001aa0| 6f 73 69 74 69 6f 6e 69 | 6e 67 20 66 75 6e 63 74 |ositioni|ng funct|
|00001ab0| 69 6f 6e 2c 5c 6e 60 65 | 64 69 66 66 2d 6d 61 6b |ion,\n`e|diff-mak|
|00001ac0| 65 2d 66 72 61 6d 65 2d | 70 6f 73 69 74 69 6f 6e |e-frame-|position|
|00001ad0| 27 20 74 6f 20 61 64 6a | 75 73 74 20 74 68 65 20 |' to adj|ust the |
|00001ae0| 70 6f 73 69 74 69 6f 6e | 20 6f 66 20 74 68 65 20 |position| of the |
|00001af0| 63 6f 6e 74 72 6f 6c 20 | 66 72 61 6d 65 5c 6e 77 |control |frame\nw|
|00001b00| 68 65 6e 20 69 74 20 73 | 68 6f 77 73 20 74 68 65 |hen it s|hows the|
|00001b10| 20 73 68 6f 72 74 20 6d | 65 6e 75 2e 20 54 68 69 | short m|enu. Thi|
|00001b20| 73 20 76 61 72 69 61 62 | 6c 65 20 69 73 20 70 72 |s variab|le is pr|
|00001b30| 6f 76 69 64 65 64 20 66 | 6f 72 20 65 61 73 79 5c |ovided f|or easy\|
|00001b40| 6e 63 75 73 74 6f 6d 69 | 7a 61 74 69 6f 6e 20 6f |ncustomi|zation o|
|00001b50| 66 20 74 68 65 20 64 65 | 66 61 75 6c 74 2e 22 20 |f the de|fault." |
|00001b60| 3a 74 79 70 65 20 27 69 | 6e 74 65 67 65 72 20 3a |:type 'i|nteger :|
|00001b70| 67 72 6f 75 70 20 27 65 | 64 69 66 66 2d 77 69 6e |group 'e|diff-win|
|00001b80| 64 6f 77 29 0a 28 63 75 | 73 74 6f 6d 2d 64 65 63 |dow).(cu|stom-dec|
|00001b90| 6c 61 72 65 2d 76 61 72 | 69 61 62 6c 65 20 27 65 |lare-var|iable 'e|
|00001ba0| 64 69 66 66 2d 77 69 64 | 65 2d 63 6f 6e 74 72 6f |diff-wid|e-contro|
|00001bb0| 6c 2d 66 72 61 6d 65 2d | 72 69 67 68 74 77 61 72 |l-frame-|rightwar|
|00001bc0| 64 2d 73 68 69 66 74 20 | 27 37 20 22 2a 54 68 65 |d-shift |'7 "*The|
|00001bd0| 20 72 69 67 68 74 77 61 | 72 64 20 73 68 69 66 74 | rightwa|rd shift|
|00001be0| 20 6f 66 20 63 6f 6e 74 | 72 6f 6c 20 66 72 61 6d | of cont|rol fram|
|00001bf0| 65 20 66 72 6f 6d 20 74 | 68 65 20 6c 65 66 74 20 |e from t|he left |
|00001c00| 65 64 67 65 20 6f 66 20 | 62 75 66 20 41 27 73 20 |edge of |buf A's |
|00001c10| 66 72 61 6d 65 2e 5c 6e | 4d 65 61 73 75 72 65 64 |frame.\n|Measured|
|00001c20| 20 69 6e 20 63 68 61 72 | 61 63 74 65 72 73 2e 5c | in char|acters.\|
|00001c30| 6e 54 68 69 73 20 69 73 | 20 75 73 65 64 20 62 79 |nThis is| used by|
|00001c40| 20 74 68 65 20 64 65 66 | 61 75 6c 74 20 63 6f 6e | the def|ault con|
|00001c50| 74 72 6f 6c 20 66 72 61 | 6d 65 20 70 6f 73 69 74 |trol fra|me posit|
|00001c60| 69 6f 6e 69 6e 67 20 66 | 75 6e 63 74 69 6f 6e 2c |ioning f|unction,|
|00001c70| 5c 6e 60 65 64 69 66 66 | 2d 6d 61 6b 65 2d 66 72 |\n`ediff|-make-fr|
|00001c80| 61 6d 65 2d 70 6f 73 69 | 74 69 6f 6e 27 20 74 6f |ame-posi|tion' to|
|00001c90| 20 61 64 6a 75 73 74 20 | 74 68 65 20 70 6f 73 69 | adjust |the posi|
|00001ca0| 74 69 6f 6e 20 6f 66 20 | 74 68 65 20 63 6f 6e 74 |tion of |the cont|
|00001cb0| 72 6f 6c 20 66 72 61 6d | 65 5c 6e 77 68 65 6e 20 |rol fram|e\nwhen |
|00001cc0| 69 74 20 73 68 6f 77 73 | 20 74 68 65 20 66 75 6c |it shows| the ful|
|00001cd0| 6c 20 6d 65 6e 75 2e 20 | 54 68 69 73 20 76 61 72 |l menu. |This var|
|00001ce0| 69 61 62 6c 65 20 69 73 | 20 70 72 6f 76 69 64 65 |iable is| provide|
|00001cf0| 64 20 66 6f 72 20 65 61 | 73 79 5c 6e 63 75 73 74 |d for ea|sy\ncust|
|00001d00| 6f 6d 69 7a 61 74 69 6f | 6e 20 6f 66 20 74 68 65 |omizatio|n of the|
|00001d10| 20 64 65 66 61 75 6c 74 | 2e 22 20 3a 74 79 70 65 | default|." :type|
|00001d20| 20 27 69 6e 74 65 67 65 | 72 20 3a 67 72 6f 75 70 | 'intege|r :group|
|00001d30| 20 27 65 64 69 66 66 2d | 77 69 6e 64 6f 77 29 0a | 'ediff-|window).|
|00001d40| 23 40 32 20 1f 0a 28 64 | 65 66 76 61 72 20 65 64 |#@2 ..(d|efvar ed|
|00001d50| 69 66 66 2d 77 69 64 65 | 2d 64 69 73 70 6c 61 79 |iff-wide|-display|
|00001d60| 2d 70 20 6e 69 6c 20 28 | 23 24 20 2e 20 37 34 39 |-p nil (|#$ . 749|
|00001d70| 32 29 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |2)).(byt|e-code "|
|00001d80| c0 c1 21 88 c2 c1 c3 c4 | 23 87 22 20 5b 6d 61 6b |..!.....|#." [mak|
|00001d90| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|00001da0| 72 2d 6c 6f 63 61 6c 20 | 65 64 69 66 66 2d 77 69 |r-local |ediff-wi|
|00001db0| 64 65 2d 64 69 73 70 6c | 61 79 2d 70 20 70 75 74 |de-displ|ay-p put|
|00001dc0| 20 70 65 72 6d 61 6e 65 | 6e 74 2d 6c 6f 63 61 6c | permane|nt-local|
|00001dd0| 20 74 5d 20 34 29 0a 23 | 40 38 35 20 46 72 61 6d | t] 4).#|@85 Fram|
|00001de0| 65 20 70 61 72 61 6d 65 | 74 65 72 73 20 74 6f 20 |e parame|ters to |
|00001df0| 62 65 20 72 65 73 74 6f | 72 65 64 20 77 68 65 6e |be resto|red when|
|00001e00| 20 74 68 65 20 75 73 65 | 72 20 77 61 6e 74 73 20 | the use|r wants |
|00001e10| 74 6f 20 74 6f 67 67 6c | 65 20 74 68 65 20 77 69 |to toggl|e the wi|
|00001e20| 64 65 0a 64 69 73 70 6c | 61 79 20 6f 66 66 2e 1f |de.displ|ay off..|
|00001e30| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 77 |.(defvar| ediff-w|
|00001e40| 69 64 65 2d 64 69 73 70 | 6c 61 79 2d 6f 72 69 67 |ide-disp|lay-orig|
|00001e50| 2d 70 61 72 61 6d 65 74 | 65 72 73 20 6e 69 6c 20 |-paramet|ers nil |
|00001e60| 28 23 24 20 2e 20 37 36 | 34 34 29 29 0a 28 62 79 |(#$ . 76|44)).(by|
|00001e70| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|00001e80| c4 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|00001e90| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00001ea0| 20 65 64 69 66 66 2d 77 | 69 64 65 2d 64 69 73 70 | ediff-w|ide-disp|
|00001eb0| 6c 61 79 2d 6f 72 69 67 | 2d 70 61 72 61 6d 65 74 |lay-orig|-paramet|
|00001ec0| 65 72 73 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |ers put |permanen|
|00001ed0| 74 2d 6c 6f 63 61 6c 20 | 74 5d 20 34 29 0a 23 40 |t-local |t] 4).#@|
|00001ee0| 33 36 20 46 72 61 6d 65 | 20 74 6f 20 62 65 20 75 |36 Frame| to be u|
|00001ef0| 73 65 64 20 66 6f 72 20 | 77 69 64 65 20 64 69 73 |sed for |wide dis|
|00001f00| 70 6c 61 79 2e 1f 0a 28 | 64 65 66 76 61 72 20 65 |play...(|defvar e|
|00001f10| 64 69 66 66 2d 77 69 64 | 65 2d 64 69 73 70 6c 61 |diff-wid|e-displa|
|00001f20| 79 2d 66 72 61 6d 65 20 | 6e 69 6c 20 28 23 24 20 |y-frame |nil (#$ |
|00001f30| 2e 20 37 39 30 37 29 29 | 0a 28 62 79 74 65 2d 63 |. 7907))|.(byte-c|
|00001f40| 6f 64 65 20 22 c0 c1 21 | 88 c2 c1 c3 c4 23 87 22 |ode "..!|.....#."|
|00001f50| 20 5b 6d 61 6b 65 2d 76 | 61 72 69 61 62 6c 65 2d | [make-v|ariable-|
|00001f60| 62 75 66 66 65 72 2d 6c | 6f 63 61 6c 20 65 64 69 |buffer-l|ocal edi|
|00001f70| 66 66 2d 77 69 64 65 2d | 64 69 73 70 6c 61 79 2d |ff-wide-|display-|
|00001f80| 66 72 61 6d 65 20 70 75 | 74 20 70 65 72 6d 61 6e |frame pu|t perman|
|00001f90| 65 6e 74 2d 6c 6f 63 61 | 6c 20 74 5d 20 34 29 0a |ent-loca|l t] 4).|
|00001fa0| 23 40 33 37 32 20 54 68 | 65 20 76 61 6c 75 65 20 |#@372 Th|e value |
|00001fb0| 69 73 20 61 20 66 75 6e | 63 74 69 6f 6e 20 74 68 |is a fun|ction th|
|00001fc0| 61 74 20 69 73 20 63 61 | 6c 6c 65 64 20 74 6f 20 |at is ca|lled to |
|00001fd0| 63 72 65 61 74 65 20 61 | 20 77 69 64 65 20 64 69 |create a| wide di|
|00001fe0| 73 70 6c 61 79 2e 0a 54 | 68 65 20 66 75 6e 63 74 |splay..T|he funct|
|00001ff0| 69 6f 6e 20 69 73 20 63 | 61 6c 6c 65 64 20 77 69 |ion is c|alled wi|
|00002000| 74 68 6f 75 74 20 61 72 | 67 75 6d 65 6e 74 73 2e |thout ar|guments.|
|00002010| 20 49 74 20 73 68 6f 75 | 6c 64 20 72 65 73 69 7a | It shou|ld resiz|
|00002020| 65 20 74 68 65 20 66 72 | 61 6d 65 20 69 6e 0a 77 |e the fr|ame in.w|
|00002030| 68 69 63 68 20 62 75 66 | 66 65 72 73 20 41 2c 20 |hich buf|fers A, |
|00002040| 42 2c 20 61 6e 64 20 43 | 20 61 72 65 20 74 6f 20 |B, and C| are to |
|00002050| 62 65 20 64 69 73 70 6c | 61 79 65 64 2c 20 61 6e |be displ|ayed, an|
|00002060| 64 20 69 74 20 73 68 6f | 75 6c 64 20 73 61 76 65 |d it sho|uld save|
|00002070| 20 74 68 65 20 6f 6c 64 | 0a 66 72 61 6d 65 20 70 | the old|.frame p|
|00002080| 61 72 61 6d 65 74 65 72 | 73 20 69 6e 20 60 65 64 |arameter|s in `ed|
|00002090| 69 66 66 2d 77 69 64 65 | 2d 64 69 73 70 6c 61 79 |iff-wide|-display|
|000020a0| 2d 6f 72 69 67 2d 70 61 | 72 61 6d 65 74 65 72 73 |-orig-pa|rameters|
|000020b0| 27 2e 0a 54 68 65 20 76 | 61 72 69 61 62 6c 65 20 |'..The v|ariable |
|000020c0| 60 65 64 69 66 66 2d 77 | 69 64 65 2d 64 69 73 70 |`ediff-w|ide-disp|
|000020d0| 6c 61 79 2d 66 72 61 6d | 65 27 20 73 68 6f 75 6c |lay-fram|e' shoul|
|000020e0| 64 20 62 65 20 73 65 74 | 20 74 6f 20 63 6f 6e 74 |d be set| to cont|
|000020f0| 61 69 6e 0a 74 68 65 20 | 66 72 61 6d 65 20 75 73 |ain.the |frame us|
|00002100| 65 64 20 66 6f 72 20 74 | 68 65 20 77 69 64 65 20 |ed for t|he wide |
|00002110| 64 69 73 70 6c 61 79 2e | 1f 0a 28 64 65 66 76 61 |display.|..(defva|
|00002120| 72 20 65 64 69 66 66 2d | 6d 61 6b 65 2d 77 69 64 |r ediff-|make-wid|
|00002130| 65 2d 64 69 73 70 6c 61 | 79 2d 66 75 6e 63 74 69 |e-displa|y-functi|
|00002140| 6f 6e 20 27 65 64 69 66 | 66 2d 6d 61 6b 65 2d 77 |on 'edif|f-make-w|
|00002150| 69 64 65 2d 64 69 73 70 | 6c 61 79 20 28 23 24 20 |ide-disp|lay (#$ |
|00002160| 2e 20 38 31 30 32 29 29 | 0a 28 62 79 74 65 2d 63 |. 8102))|.(byte-c|
|00002170| 6f 64 65 20 22 c0 c1 21 | 88 c2 c1 c3 c4 23 87 22 |ode "..!|.....#."|
|00002180| 20 5b 6d 61 6b 65 2d 76 | 61 72 69 61 62 6c 65 2d | [make-v|ariable-|
|00002190| 62 75 66 66 65 72 2d 6c | 6f 63 61 6c 20 65 64 69 |buffer-l|ocal edi|
|000021a0| 66 66 2d 6d 61 6b 65 2d | 77 69 64 65 2d 64 69 73 |ff-make-|wide-dis|
|000021b0| 70 6c 61 79 2d 66 75 6e | 63 74 69 6f 6e 20 70 75 |play-fun|ction pu|
|000021c0| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|000021d0| 6c 20 74 5d 20 34 29 0a | 23 40 32 20 1f 0a 28 64 |l t] 4).|#@2 ..(d|
|000021e0| 65 66 76 61 72 20 65 64 | 69 66 66 2d 63 6f 6e 74 |efvar ed|iff-cont|
|000021f0| 72 6f 6c 2d 66 72 61 6d | 65 20 6e 69 6c 20 28 23 |rol-fram|e nil (#|
|00002200| 24 20 2e 20 38 36 36 38 | 29 29 0a 28 62 79 74 65 |$ . 8668|)).(byte|
|00002210| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|00002220| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|00002230| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|00002240| 64 69 66 66 2d 63 6f 6e | 74 72 6f 6c 2d 66 72 61 |diff-con|trol-fra|
|00002250| 6d 65 20 70 75 74 20 70 | 65 72 6d 61 6e 65 6e 74 |me put p|ermanent|
|00002260| 2d 6c 6f 63 61 6c 20 74 | 5d 20 34 29 0a 28 63 75 |-local t|] 4).(cu|
|00002270| 73 74 6f 6d 2d 64 65 63 | 6c 61 72 65 2d 76 61 72 |stom-dec|lare-var|
|00002280| 69 61 62 6c 65 20 27 65 | 64 69 66 66 2d 70 72 65 |iable 'e|diff-pre|
|00002290| 66 65 72 2d 69 63 6f 6e | 69 66 69 65 64 2d 63 6f |fer-icon|ified-co|
|000022a0| 6e 74 72 6f 6c 2d 66 72 | 61 6d 65 20 27 6e 69 6c |ntrol-fr|ame 'nil|
|000022b0| 20 22 2a 49 66 20 74 2c | 20 6b 65 65 70 20 63 6f | "*If t,| keep co|
|000022c0| 6e 74 72 6f 6c 20 70 61 | 6e 65 6c 20 69 63 6f 6e |ntrol pa|nel icon|
|000022d0| 69 66 69 65 64 20 77 68 | 65 6e 20 68 65 6c 70 20 |ified wh|en help |
|000022e0| 6d 65 73 73 61 67 65 20 | 69 73 20 6f 66 66 2e 5c |message |is off.\|
|000022f0| 6e 54 68 69 73 20 68 61 | 73 20 65 66 66 65 63 74 |nThis ha|s effect|
|00002300| 20 6f 6e 6c 79 20 6f 6e | 20 61 20 77 69 6e 64 6f | only on| a windo|
|00002310| 77 69 6e 67 20 73 79 73 | 74 65 6d 2e 5c 6e 49 66 |wing sys|tem.\nIf|
|00002320| 20 74 2c 20 68 69 74 74 | 69 6e 67 20 60 3f 27 20 | t, hitt|ing `?' |
|00002330| 74 6f 20 74 6f 67 67 6c | 65 20 63 6f 6e 74 72 6f |to toggl|e contro|
|00002340| 6c 20 70 61 6e 65 6c 20 | 6f 66 66 20 69 63 6f 6e |l panel |off icon|
|00002350| 69 66 69 65 73 20 69 74 | 2e 5c 6e 5c 6e 54 68 69 |ifies it|.\n\nThi|
|00002360| 73 20 69 73 20 6f 6e 6c | 79 20 75 73 65 66 75 6c |s is onl|y useful|
|00002370| 20 69 6e 20 45 6d 61 63 | 73 20 61 6e 64 20 6f 6e | in Emac|s and on|
|00002380| 6c 79 20 66 6f 72 20 63 | 65 72 74 61 69 6e 20 6b |ly for c|ertain k|
|00002390| 69 6e 64 73 20 6f 66 20 | 77 69 6e 64 6f 77 20 6d |inds of |window m|
|000023a0| 61 6e 61 67 65 72 73 2c | 5c 6e 73 75 63 68 20 61 |anagers,|\nsuch a|
|000023b0| 73 20 54 57 4d 20 61 6e | 64 20 69 74 73 20 64 65 |s TWM an|d its de|
|000023c0| 72 69 76 61 74 69 76 65 | 73 2c 20 73 69 6e 63 65 |rivative|s, since|
|000023d0| 20 74 68 65 20 77 69 6e | 64 6f 77 20 6d 61 6e 61 | the win|dow mana|
|000023e0| 67 65 72 20 6d 75 73 74 | 20 70 65 72 6d 69 74 5c |ger must| permit\|
|000023f0| 6e 6b 65 79 62 6f 61 72 | 64 20 69 6e 70 75 74 20 |nkeyboar|d input |
|00002400| 74 6f 20 67 6f 20 69 6e | 74 6f 20 69 63 6f 6e 73 |to go in|to icons|
|00002410| 2e 20 58 45 6d 61 63 73 | 20 63 6f 6d 70 6c 65 74 |. XEmacs| complet|
|00002420| 65 6c 79 20 69 67 6e 6f | 72 65 73 20 6b 65 79 62 |ely igno|res keyb|
|00002430| 6f 61 72 64 20 69 6e 70 | 75 74 5c 6e 69 6e 74 6f |oard inp|ut\ninto|
|00002440| 20 69 63 6f 6e 73 2c 20 | 72 65 67 61 72 64 6c 65 | icons, |regardle|
|00002450| 73 73 20 6f 66 20 74 68 | 65 20 77 69 6e 64 6f 77 |ss of th|e window|
|00002460| 20 6d 61 6e 61 67 65 72 | 2e 22 20 3a 74 79 70 65 | manager|." :type|
|00002470| 20 27 62 6f 6f 6c 65 61 | 6e 20 3a 67 72 6f 75 70 | 'boolea|n :group|
|00002480| 20 27 65 64 69 66 66 2d | 77 69 6e 64 6f 77 29 0a | 'ediff-|window).|
|00002490| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|000024a0| 2d 67 65 74 2d 77 69 6e | 64 6f 77 2d 62 79 2d 63 |-get-win|dow-by-c|
|000024b0| 6c 69 63 6b 69 6e 67 20 | 23 5b 28 77 69 6e 64 20 |licking |#[(wind |
|000024c0| 70 72 65 76 2d 77 69 6e | 64 20 77 69 6e 64 2d 6e |prev-win|d wind-n|
|000024d0| 75 6d 62 65 72 29 20 22 | c0 19 c2 c3 0c 5c 22 88 |umber) "|.....\".|
|000024e0| c5 20 89 11 19 0e 06 ab | 85 c7 09 21 aa 89 c8 c9 |. ......|...!....|
|000024f0| ca cb cc 09 21 5c 22 5c | 22 29 ac 90 cd ce 21 ab |....!\"\|")....!.|
|00002500| 84 cf ce 21 88 c2 d0 0c | 5c 22 88 aa 56 c5 20 88 |...!....|\"..V. .|
|00002510| 0e 06 ab 85 d1 09 21 aa | 85 d2 d3 09 21 21 89 16 |......!.|....!!..|
|00002520| 14 29 87 22 20 5b 6e 69 | 6c 20 65 76 65 6e 74 20 |.)." [ni|l event |
|00002530| 6d 65 73 73 61 67 65 20 | 22 53 65 6c 65 63 74 20 |message |"Select |
|00002540| 77 69 6e 64 6f 77 73 20 | 62 79 20 63 6c 69 63 6b |windows |by click|
|00002550| 69 6e 67 2e 20 50 6c 65 | 61 73 65 20 63 6c 69 63 |ing. Ple|ase clic|
|00002560| 6b 20 6f 6e 20 57 69 6e | 64 6f 77 20 25 64 20 22 |k on Win|dow %d "|
|00002570| 20 77 69 6e 64 2d 6e 75 | 6d 62 65 72 20 65 64 69 | wind-nu|mber edi|
|00002580| 66 66 2d 72 65 61 64 2d | 65 76 65 6e 74 20 65 64 |ff-read-|event ed|
|00002590| 69 66 66 2d 78 65 6d 61 | 63 73 2d 70 20 62 75 74 |iff-xema|cs-p but|
|000025a0| 74 6f 6e 2d 65 76 65 6e | 74 2d 70 20 73 74 72 69 |ton-even|t-p stri|
|000025b0| 6e 67 2d 6d 61 74 63 68 | 20 22 6d 6f 75 73 65 22 |ng-match| "mouse"|
|000025c0| 20 66 6f 72 6d 61 74 20 | 22 25 53 22 20 65 76 65 | format |"%S" eve|
|000025d0| 6e 74 2d 62 61 73 69 63 | 2d 74 79 70 65 20 73 69 |nt-basic|-type si|
|000025e0| 74 2d 66 6f 72 20 31 20 | 62 65 65 70 20 22 50 6c |t-for 1 |beep "Pl|
|000025f0| 65 61 73 65 20 63 6c 69 | 63 6b 20 6f 6e 20 57 69 |ease cli|ck on Wi|
|00002600| 6e 64 6f 77 20 25 64 20 | 22 20 65 76 65 6e 74 2d |ndow %d |" event-|
|00002610| 77 69 6e 64 6f 77 20 70 | 6f 73 6e 2d 77 69 6e 64 |window p|osn-wind|
|00002620| 6f 77 20 65 76 65 6e 74 | 2d 73 74 61 72 74 20 77 |ow event|-start w|
|00002630| 69 6e 64 5d 20 36 5d 29 | 0a 28 64 65 66 61 6c 69 |ind] 6])|.(defali|
|00002640| 61 73 20 27 65 64 69 66 | 66 2d 73 65 6c 65 63 74 |as 'edif|f-select|
|00002650| 2d 6c 6f 77 65 73 74 2d | 77 69 6e 64 6f 77 20 23 |-lowest-|window #|
|00002660| 5b 6e 69 6c 20 22 08 ab | 85 c1 c2 20 21 87 c3 20 |[nil "..|... !.. |
|00002670| 1c c5 20 41 41 41 40 1e | 06 8a c7 c8 21 88 c3 20 |.. AAA@.|....!.. |
|00002680| 29 1e 09 ca 1e 0b 0e 0b | ad b2 cc 20 1e 0d c5 0e |).......|... ....|
|00002690| 0d 21 41 41 41 40 1e 0e | 0e 06 0e 0e 57 ab 87 0e |.!AAA@..|....W...|
|000026a0| 0e 16 06 0e 0d 14 c1 0e | 0d 21 88 0e 09 0e 0d 61 |........|.!.....a|
|000026b0| ab 87 c1 0c 21 88 cf 16 | 0b 2a aa 4a 2c 87 22 20 |....!...|.*.J,." |
|000026c0| 5b 65 64 69 66 66 2d 78 | 65 6d 61 63 73 2d 70 20 |[ediff-x|emacs-p |
|000026d0| 73 65 6c 65 63 74 2d 77 | 69 6e 64 6f 77 20 66 72 |select-w|indow fr|
|000026e0| 61 6d 65 2d 6c 6f 77 65 | 73 74 2d 77 69 6e 64 6f |ame-lowe|st-windo|
|000026f0| 77 20 73 65 6c 65 63 74 | 65 64 2d 77 69 6e 64 6f |w select|ed-windo|
|00002700| 77 20 6c 6f 77 65 73 74 | 2d 77 69 6e 64 6f 77 20 |w lowest|-window |
|00002710| 77 69 6e 64 6f 77 2d 65 | 64 67 65 73 20 62 6f 74 |window-e|dges bot|
|00002720| 74 6f 6d 2d 65 64 67 65 | 20 6f 74 68 65 72 2d 77 |tom-edge| other-w|
|00002730| 69 6e 64 6f 77 20 2d 31 | 20 6c 61 73 74 2d 77 69 |indow -1| last-wi|
|00002740| 6e 64 6f 77 20 74 20 77 | 69 6e 64 6f 77 2d 73 65 |ndow t w|indow-se|
|00002750| 61 72 63 68 20 6e 65 78 | 74 2d 77 69 6e 64 6f 77 |arch nex|t-window|
|00002760| 20 74 68 69 73 2d 77 69 | 6e 64 6f 77 20 6e 65 78 | this-wi|ndow nex|
|00002770| 74 2d 62 6f 74 74 6f 6d | 2d 65 64 67 65 20 6e 69 |t-bottom|-edge ni|
|00002780| 6c 5d 20 32 5d 29 0a 28 | 64 65 66 61 6c 69 61 73 |l] 2]).(|defalias|
|00002790| 20 27 65 64 69 66 66 2d | 73 65 74 75 70 2d 77 69 | 'ediff-|setup-wi|
|000027a0| 6e 64 6f 77 73 20 23 5b | 28 62 75 66 66 65 72 2d |ndows #[|(buffer-|
|000027b0| 41 20 62 75 66 66 65 72 | 2d 42 20 62 75 66 66 65 |A buffer|-B buffe|
|000027c0| 72 2d 43 20 63 6f 6e 74 | 72 6f 6c 2d 62 75 66 66 |r-C cont|rol-buff|
|000027d0| 65 72 29 20 22 c0 c1 21 | 88 c2 20 c3 20 61 ab 84 |er) "..!|.. . a..|
|000027e0| c4 c5 21 88 c6 20 ac 83 | c7 16 08 c9 0e 5c 6e 21 |..!.. ..|.....\n!|
|000027f0| ac b0 0e 5c 6e ab 98 cb | 0e 5c 6e 21 ab 92 cc cb |...\n...|.\n!....|
|00002800| 0e 5c 6e 21 21 ab 8a 72 | 0e 5c 6e 71 88 0e 08 29 |.\n!!..r|.\nq...)|
|00002810| aa 8a 0e 0d ce 61 ae 84 | cf 0e 10 21 0e 11 0e 12 |.....a..|...!....|
|00002820| 0e 13 0e 5c 6e 24 88 c0 | d4 21 87 22 20 5b 72 75 |...\n$..|.!." [ru|
|00002830| 6e 2d 68 6f 6f 6b 73 20 | 65 64 69 66 66 2d 62 65 |n-hooks |ediff-be|
|00002840| 66 6f 72 65 2d 73 65 74 | 75 70 2d 77 69 6e 64 6f |fore-set|up-windo|
|00002850| 77 73 2d 68 6f 6f 6b 20 | 73 65 6c 65 63 74 65 64 |ws-hook |selected|
|00002860| 2d 77 69 6e 64 6f 77 20 | 6d 69 6e 69 62 75 66 66 |-window |minibuff|
|00002870| 65 72 2d 77 69 6e 64 6f | 77 20 6f 74 68 65 72 2d |er-windo|w other-|
|00002880| 77 69 6e 64 6f 77 20 31 | 20 65 64 69 66 66 2d 77 |window 1| ediff-w|
|00002890| 69 6e 64 6f 77 2d 64 69 | 73 70 6c 61 79 2d 70 20 |indow-di|splay-p |
|000028a0| 65 64 69 66 66 2d 73 65 | 74 75 70 2d 77 69 6e 64 |ediff-se|tup-wind|
|000028b0| 6f 77 73 2d 70 6c 61 69 | 6e 20 65 64 69 66 66 2d |ows-plai|n ediff-|
|000028c0| 77 69 6e 64 6f 77 2d 73 | 65 74 75 70 2d 66 75 6e |window-s|etup-fun|
|000028d0| 63 74 69 6f 6e 20 65 64 | 69 66 66 2d 6b 65 65 70 |ction ed|iff-keep|
|000028e0| 2d 77 69 6e 64 6f 77 2d | 63 6f 6e 66 69 67 20 63 |-window-|config c|
|000028f0| 6f 6e 74 72 6f 6c 2d 62 | 75 66 66 65 72 20 67 65 |ontrol-b|uffer ge|
|00002900| 74 2d 62 75 66 66 65 72 | 20 62 75 66 66 65 72 2d |t-buffer| buffer-|
|00002910| 6e 61 6d 65 20 74 68 69 | 73 2d 63 6f 6d 6d 61 6e |name thi|s-comman|
|00002920| 64 20 65 64 69 66 66 2d | 71 75 69 74 20 65 72 72 |d ediff-|quit err|
|00002930| 6f 72 20 65 64 69 66 66 | 2d 4b 49 4c 4c 45 44 2d |or ediff|-KILLED-|
|00002940| 56 49 54 41 4c 2d 42 55 | 46 46 45 52 20 62 75 66 |VITAL-BU|FFER buf|
|00002950| 66 65 72 2d 41 20 62 75 | 66 66 65 72 2d 42 20 62 |fer-A bu|ffer-B b|
|00002960| 75 66 66 65 72 2d 43 20 | 65 64 69 66 66 2d 61 66 |uffer-C |ediff-af|
|00002970| 74 65 72 2d 73 65 74 75 | 70 2d 77 69 6e 64 6f 77 |ter-setu|p-window|
|00002980| 73 2d 68 6f 6f 6b 5d 20 | 35 5d 29 0a 28 64 65 66 |s-hook] |5]).(def|
|00002990| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 73 65 74 |alias 'e|diff-set|
|000029a0| 75 70 2d 77 69 6e 64 6f | 77 73 2d 70 6c 61 69 6e |up-windo|ws-plain|
|000029b0| 20 23 5b 28 62 75 66 66 | 65 72 2d 41 20 62 75 66 | #[(buff|er-A buf|
|000029c0| 66 65 72 2d 42 20 62 75 | 66 66 65 72 2d 43 20 63 |fer-B bu|ffer-C c|
|000029d0| 6f 6e 74 72 6f 6c 2d 62 | 75 66 66 65 72 29 20 22 |ontrol-b|uffer) "|
|000029e0| 08 ab 95 c1 08 21 ab 90 | c2 c1 08 21 21 ab 89 72 |.....!..|...!!..r|
|000029f0| 08 71 88 c3 14 29 aa 8a | 0d c6 61 ac 85 c7 0e 08 |.q...)..|..a.....|
|00002a00| 21 88 0e 09 ab 8a ca 0e | 0b 0e 0c 0e 0d 08 24 87 |!.......|......$.|
|00002a10| ce 0e 0b 0e 0c 0e 0d 08 | 24 87 22 20 5b 63 6f 6e |........|$." [con|
|00002a20| 74 72 6f 6c 2d 62 75 66 | 66 65 72 20 67 65 74 2d |trol-buf|fer get-|
|00002a30| 62 75 66 66 65 72 20 62 | 75 66 66 65 72 2d 6e 61 |buffer b|uffer-na|
|00002a40| 6d 65 20 6e 69 6c 20 65 | 64 69 66 66 2d 6d 75 6c |me nil e|diff-mul|
|00002a50| 74 69 66 72 61 6d 65 20 | 74 68 69 73 2d 63 6f 6d |tiframe |this-com|
|00002a60| 6d 61 6e 64 20 65 64 69 | 66 66 2d 71 75 69 74 20 |mand edi|ff-quit |
|00002a70| 65 72 72 6f 72 20 65 64 | 69 66 66 2d 4b 49 4c 4c |error ed|iff-KILL|
|00002a80| 45 44 2d 56 49 54 41 4c | 2d 42 55 46 46 45 52 20 |ED-VITAL|-BUFFER |
|00002a90| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 6a 6f 62 20 |ediff-me|rge-job |
|00002aa0| 65 64 69 66 66 2d 73 65 | 74 75 70 2d 77 69 6e 64 |ediff-se|tup-wind|
|00002ab0| 6f 77 73 2d 70 6c 61 69 | 6e 2d 6d 65 72 67 65 20 |ows-plai|n-merge |
|00002ac0| 62 75 66 66 65 72 2d 41 | 20 62 75 66 66 65 72 2d |buffer-A| buffer-|
|00002ad0| 42 20 62 75 66 66 65 72 | 2d 43 20 65 64 69 66 66 |B buffer|-C ediff|
|00002ae0| 2d 73 65 74 75 70 2d 77 | 69 6e 64 6f 77 73 2d 70 |-setup-w|indows-p|
|00002af0| 6c 61 69 6e 2d 63 6f 6d | 70 61 72 65 5d 20 35 5d |lain-com|pare] 5]|
|00002b00| 29 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |).(defal|ias 'edi|
|00002b10| 66 66 2d 73 65 74 75 70 | 2d 77 69 6e 64 6f 77 73 |ff-setup|-windows|
|00002b20| 2d 70 6c 61 69 6e 2d 6d | 65 72 67 65 20 23 5b 28 |-plain-m|erge #[(|
|00002b30| 62 75 66 2d 41 20 62 75 | 66 2d 42 20 62 75 66 2d |buf-A bu|f-B buf-|
|00002b40| 43 20 63 6f 6e 74 72 6f | 6c 2d 62 75 66 66 65 72 |C contro|l-buffer|
|00002b50| 29 20 22 c0 09 21 88 c2 | c3 89 89 89 89 89 1c 1d |) "..!..|........|
|00002b60| 1e 06 1e 07 1e 08 1e 09 | 1e 5c 6e 09 ab 9b cb 09 |........|.\n.....|
|00002b70| 21 ab 96 cc cb 09 21 21 | ab 8f 72 09 71 88 0e 0d |!.....!!|..r.q...|
|00002b80| 16 08 0e 0e 16 09 29 aa | 8b 0e 0f d0 61 ac 85 d1 |......).|....a...|
|00002b90| 0e 12 21 88 d3 20 88 d4 | 20 88 d5 20 88 d6 09 21 |..!.. ..| .. ...!|
|00002ba0| 88 d7 c2 21 88 d8 d9 da | 20 0e 08 5f 21 5d 16 07 |...!....| .._!]..|
|00002bb0| db 0e 1c 21 88 dd 20 16 | 06 d4 d8 da 20 0e 07 5a |...!.. .|.... ..Z|
|00002bc0| 5d 21 88 dd 20 0e 06 61 | ab 84 d7 c2 21 88 dd 20 |]!.. ..a|....!.. |
|00002bd0| 14 db 0e 1e 21 88 df 0e | 06 21 88 0e 09 20 88 dd |....!...|.!... ..|
|00002be0| 20 0e 06 61 ab 84 d7 c2 | 21 88 db 0e 20 21 88 dd | ..a....|!... !..|
|00002bf0| 20 15 09 ab 9d cb 09 21 | ab 98 cc cb 09 21 21 ab | ......!|.....!!.|
|00002c00| 91 72 09 71 88 0e 06 16 | 21 0d 16 5c 22 0c 16 23 |.r.q....|!..\"..#|
|00002c10| 29 aa 8b 0e 0f d0 61 ac | 85 d1 0e 12 21 88 d5 20 |).....a.|....!.. |
|00002c20| 88 d6 09 21 2e 07 87 22 | 20 5b 65 64 69 66 66 2d |...!..."| [ediff-|
|00002c30| 64 65 73 74 72 6f 79 2d | 63 6f 6e 74 72 6f 6c 2d |destroy-|control-|
|00002c40| 66 72 61 6d 65 20 63 6f | 6e 74 72 6f 6c 2d 62 75 |frame co|ntrol-bu|
|00002c50| 66 66 65 72 20 31 20 6e | 69 6c 20 77 69 6e 64 2d |ffer 1 n|il wind-|
|00002c60| 43 20 77 69 6e 64 2d 42 | 20 77 69 6e 64 2d 41 20 |C wind-B| wind-A |
|00002c70| 6d 65 72 67 65 2d 77 69 | 6e 64 6f 77 2d 6c 69 6e |merge-wi|ndow-lin|
|00002c80| 65 73 20 6d 65 72 67 65 | 2d 77 69 6e 64 6f 77 2d |es merge|-window-|
|00002c90| 73 68 61 72 65 20 73 70 | 6c 69 74 2d 77 69 6e 64 |share sp|lit-wind|
|00002ca0| 6f 77 2d 66 75 6e 63 74 | 69 6f 6e 20 77 69 6e 64 |ow-funct|ion wind|
|00002cb0| 6f 77 2d 6d 69 6e 2d 68 | 65 69 67 68 74 20 67 65 |ow-min-h|eight ge|
|00002cc0| 74 2d 62 75 66 66 65 72 | 20 62 75 66 66 65 72 2d |t-buffer| buffer-|
|00002cd0| 6e 61 6d 65 20 65 64 69 | 66 66 2d 6d 65 72 67 65 |name edi|ff-merge|
|00002ce0| 2d 77 69 6e 64 6f 77 2d | 73 68 61 72 65 20 65 64 |-window-|share ed|
|00002cf0| 69 66 66 2d 73 70 6c 69 | 74 2d 77 69 6e 64 6f 77 |iff-spli|t-window|
|00002d00| 2d 66 75 6e 63 74 69 6f | 6e 20 74 68 69 73 2d 63 |-functio|n this-c|
|00002d10| 6f 6d 6d 61 6e 64 20 65 | 64 69 66 66 2d 71 75 69 |ommand e|diff-qui|
|00002d20| 74 20 65 72 72 6f 72 20 | 65 64 69 66 66 2d 4b 49 |t error |ediff-KI|
|00002d30| 4c 4c 45 44 2d 56 49 54 | 41 4c 2d 42 55 46 46 45 |LLED-VIT|AL-BUFFE|
|00002d40| 52 20 64 65 6c 65 74 65 | 2d 6f 74 68 65 72 2d 77 |R delete|-other-w|
|00002d50| 69 6e 64 6f 77 73 20 73 | 70 6c 69 74 2d 77 69 6e |indows s|plit-win|
|00002d60| 64 6f 77 2d 76 65 72 74 | 69 63 61 6c 6c 79 20 65 |dow-vert|ically e|
|00002d70| 64 69 66 66 2d 73 65 6c | 65 63 74 2d 6c 6f 77 65 |diff-sel|ect-lowe|
|00002d80| 73 74 2d 77 69 6e 64 6f | 77 20 65 64 69 66 66 2d |st-windo|w ediff-|
|00002d90| 73 65 74 75 70 2d 63 6f | 6e 74 72 6f 6c 2d 62 75 |setup-co|ntrol-bu|
|00002da0| 66 66 65 72 20 6f 74 68 | 65 72 2d 77 69 6e 64 6f |ffer oth|er-windo|
|00002db0| 77 20 32 20 72 6f 75 6e | 64 20 77 69 6e 64 6f 77 |w 2 roun|d window|
|00002dc0| 2d 68 65 69 67 68 74 20 | 73 77 69 74 63 68 2d 74 |-height |switch-t|
|00002dd0| 6f 2d 62 75 66 66 65 72 | 20 62 75 66 2d 41 20 73 |o-buffer| buf-A s|
|00002de0| 65 6c 65 63 74 65 64 2d | 77 69 6e 64 6f 77 20 62 |elected-|window b|
|00002df0| 75 66 2d 43 20 73 65 6c | 65 63 74 2d 77 69 6e 64 |uf-C sel|ect-wind|
|00002e00| 6f 77 20 62 75 66 2d 42 | 20 65 64 69 66 66 2d 77 |ow buf-B| ediff-w|
|00002e10| 69 6e 64 6f 77 2d 41 20 | 65 64 69 66 66 2d 77 69 |indow-A |ediff-wi|
|00002e20| 6e 64 6f 77 2d 42 20 65 | 64 69 66 66 2d 77 69 6e |ndow-B e|diff-win|
|00002e30| 64 6f 77 2d 43 5d 20 37 | 5d 29 0a 28 64 65 66 61 |dow-C] 7|]).(defa|
|00002e40| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 73 65 74 75 |lias 'ed|iff-setu|
|00002e50| 70 2d 77 69 6e 64 6f 77 | 73 2d 70 6c 61 69 6e 2d |p-window|s-plain-|
|00002e60| 63 6f 6d 70 61 72 65 20 | 23 5b 28 62 75 66 2d 41 |compare |#[(buf-A|
|00002e70| 20 62 75 66 2d 42 20 62 | 75 66 2d 43 20 63 6f 6e | buf-B b|uf-C con|
|00002e80| 74 72 6f 6c 2d 62 75 66 | 66 65 72 29 20 22 c0 09 |trol-buf|fer) "..|
|00002e90| 21 88 c2 c3 89 89 89 89 | 89 89 89 1c 1d 1e 06 1e |!.......|........|
|00002ea0| 07 1e 08 1e 09 1e 5c 6e | 1e 0b 1e 0c 09 ab d4 cd |......\n|........|
|00002eb0| 09 21 ab cf ce cd 09 21 | 21 ab c8 72 09 71 88 0e |.!.....!|!..r.q..|
|00002ec0| 0f 40 1e 10 d1 0e 10 21 | ad 8e 0e 12 ab 86 d3 0e |.@.....!|........|
|00002ed0| 10 21 aa 84 d4 0e 10 21 | 29 16 08 0e 0f 41 40 1e |.!.....!|)....A@.|
|00002ee0| 10 d1 0e 10 21 ad 8e 0e | 12 ab 86 d3 0e 10 21 aa |....!...|......!.|
|00002ef0| 84 d4 0e 10 21 29 16 07 | 0e 15 16 0b 0e 16 16 09 |....!)..|........|
|00002f00| 29 aa 8b 0e 17 d8 61 ac | 85 d9 0e 1a 21 88 db 20 |).....a.|....!.. |
|00002f10| 88 dc 20 88 dd 20 88 de | 09 21 88 df c2 21 88 e0 |.. .. ..|.!...!..|
|00002f20| 0e 21 21 88 e2 20 16 06 | 0e 09 ab 94 0e 0b dc 61 |.!!.. ..|.......a|
|00002f30| ab 86 e3 0e 06 21 aa 84 | e4 0e 06 21 e5 a5 16 5c |.....!..|...!...\|
|00002f40| 6e 0e 0b 0e 5c 6e 21 88 | e2 20 0e 06 61 ab 84 df |n...\n!.|. ..a...|
|00002f50| c2 21 88 e0 0e 26 21 88 | e2 20 15 0e 09 ab 96 0e |.!...&!.|. ......|
|00002f60| 0b 20 88 e2 20 0d 61 ab | 84 df c2 21 88 e0 0e 27 |. .. .a.|...!...'|
|00002f70| 21 88 e2 20 14 09 ab 9d | cd 09 21 ab 98 ce cd 09 |!.. ....|..!.....|
|00002f80| 21 21 ab 91 72 09 71 88 | 0e 06 16 28 0d 16 29 0c |!!..r.q.|...(..).|
|00002f90| 16 2a 29 aa 8b 0e 17 d8 | 61 ac 85 d9 0e 1a 21 88 |.*).....|a.....!.|
|00002fa0| 0e 2b ab 8d ec 0e 06 0e | 08 5c 22 88 ec 0d 0e 07 |.+......|.\".....|
|00002fb0| 5c 22 88 dd 20 88 de 09 | 21 2e 09 87 22 20 5b 65 |\".. ...|!..." [e|
|00002fc0| 64 69 66 66 2d 64 65 73 | 74 72 6f 79 2d 63 6f 6e |diff-des|troy-con|
|00002fd0| 74 72 6f 6c 2d 66 72 61 | 6d 65 20 63 6f 6e 74 72 |trol-fra|me contr|
|00002fe0| 6f 6c 2d 62 75 66 66 65 | 72 20 31 20 6e 69 6c 20 |ol-buffe|r 1 nil |
|00002ff0| 77 69 6e 64 2d 43 20 77 | 69 6e 64 2d 42 20 77 69 |wind-C w|ind-B wi|
|00003000| 6e 64 2d 41 20 77 69 6e | 64 2d 42 2d 73 74 61 72 |nd-A win|d-B-star|
|00003010| 74 20 77 69 6e 64 2d 41 | 2d 73 74 61 72 74 20 74 |t wind-A|-start t|
|00003020| 68 72 65 65 2d 77 61 79 | 2d 63 6f 6d 70 61 72 69 |hree-way|-compari|
|00003030| 73 6f 6e 20 77 69 6e 64 | 2d 77 69 64 74 68 2d 6f |son wind|-width-o|
|00003040| 72 2d 68 65 69 67 68 74 | 20 73 70 6c 69 74 2d 77 |r-height| split-w|
|00003050| 69 6e 64 6f 77 2d 66 75 | 6e 63 74 69 6f 6e 20 77 |indow-fu|nction w|
|00003060| 69 6e 64 6f 77 2d 6d 69 | 6e 2d 68 65 69 67 68 74 |indow-mi|n-height|
|00003070| 20 67 65 74 2d 62 75 66 | 66 65 72 20 62 75 66 66 | get-buf|fer buff|
|00003080| 65 72 2d 6e 61 6d 65 20 | 65 64 69 66 66 2d 6e 61 |er-name |ediff-na|
|00003090| 72 72 6f 77 2d 62 6f 75 | 6e 64 73 20 6f 76 65 72 |rrow-bou|nds over|
|000030a0| 6c 20 65 64 69 66 66 2d | 6f 76 65 72 6c 61 79 70 |l ediff-|overlayp|
|000030b0| 20 65 64 69 66 66 2d 65 | 6d 61 63 73 2d 70 20 6f | ediff-e|macs-p o|
|000030c0| 76 65 72 6c 61 79 2d 73 | 74 61 72 74 20 65 78 74 |verlay-s|tart ext|
|000030d0| 65 6e 74 2d 73 74 61 72 | 74 2d 70 6f 73 69 74 69 |ent-star|t-positi|
|000030e0| 6f 6e 20 65 64 69 66 66 | 2d 73 70 6c 69 74 2d 77 |on ediff|-split-w|
|000030f0| 69 6e 64 6f 77 2d 66 75 | 6e 63 74 69 6f 6e 20 65 |indow-fu|nction e|
|00003100| 64 69 66 66 2d 33 77 61 | 79 2d 63 6f 6d 70 61 72 |diff-3wa|y-compar|
|00003110| 69 73 6f 6e 2d 6a 6f 62 | 20 74 68 69 73 2d 63 6f |ison-job| this-co|
|00003120| 6d 6d 61 6e 64 20 65 64 | 69 66 66 2d 71 75 69 74 |mmand ed|iff-quit|
|00003130| 20 65 72 72 6f 72 20 65 | 64 69 66 66 2d 4b 49 4c | error e|diff-KIL|
|00003140| 4c 45 44 2d 56 49 54 41 | 4c 2d 42 55 46 46 45 52 |LED-VITA|L-BUFFER|
|00003150| 20 64 65 6c 65 74 65 2d | 6f 74 68 65 72 2d 77 69 | delete-|other-wi|
|00003160| 6e 64 6f 77 73 20 73 70 | 6c 69 74 2d 77 69 6e 64 |ndows sp|lit-wind|
|00003170| 6f 77 2d 76 65 72 74 69 | 63 61 6c 6c 79 20 65 64 |ow-verti|cally ed|
|00003180| 69 66 66 2d 73 65 6c 65 | 63 74 2d 6c 6f 77 65 73 |iff-sele|ct-lowes|
|00003190| 74 2d 77 69 6e 64 6f 77 | 20 65 64 69 66 66 2d 73 |t-window| ediff-s|
|000031a0| 65 74 75 70 2d 63 6f 6e | 74 72 6f 6c 2d 62 75 66 |etup-con|trol-buf|
|000031b0| 66 65 72 20 6f 74 68 65 | 72 2d 77 69 6e 64 6f 77 |fer othe|r-window|
|000031c0| 20 73 77 69 74 63 68 2d | 74 6f 2d 62 75 66 66 65 | switch-|to-buffe|
|000031d0| 72 20 62 75 66 2d 41 20 | 73 65 6c 65 63 74 65 64 |r buf-A |selected|
|000031e0| 2d 77 69 6e 64 6f 77 20 | 77 69 6e 64 6f 77 2d 68 |-window |window-h|
|000031f0| 65 69 67 68 74 20 77 69 | 6e 64 6f 77 2d 77 69 64 |eight wi|ndow-wid|
|00003200| 74 68 20 33 20 62 75 66 | 2d 42 20 62 75 66 2d 43 |th 3 buf|-B buf-C|
|00003210| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 2d 41 20 | ediff-w|indow-A |
|00003220| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 2d 42 20 65 |ediff-wi|ndow-B e|
|00003230| 64 69 66 66 2d 77 69 6e | 64 6f 77 2d 43 20 65 64 |diff-win|dow-C ed|
|00003240| 69 66 66 2d 77 69 6e 64 | 6f 77 73 2d 6a 6f 62 20 |iff-wind|ows-job |
|00003250| 73 65 74 2d 77 69 6e 64 | 6f 77 2d 73 74 61 72 74 |set-wind|ow-start|
|00003260| 5d 20 39 5d 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |] 9]).(d|efalias |
|00003270| 27 65 64 69 66 66 2d 73 | 65 74 75 70 2d 77 69 6e |'ediff-s|etup-win|
|00003280| 64 6f 77 73 2d 6d 75 6c | 74 69 66 72 61 6d 65 20 |dows-mul|tiframe |
|00003290| 23 5b 28 62 75 66 2d 41 | 20 62 75 66 2d 42 20 62 |#[(buf-A| buf-B b|
|000032a0| 75 66 2d 43 20 63 6f 6e | 74 72 6f 6c 2d 62 75 66 |uf-C con|trol-buf|
|000032b0| 29 20 22 08 ab 95 c1 08 | 21 ab 90 c2 c1 08 21 21 |) ".....|!.....!!|
|000032c0| ab 89 72 08 71 88 c3 14 | 29 aa 8a 0d c6 61 ac 85 |..r.q...|)....a..|
|000032d0| c7 0e 08 21 88 0e 09 ab | 8a ca 0e 0b 0e 0c 0e 0d |...!....|........|
|000032e0| 08 24 87 ce 0e 0b 0e 0c | 0e 0d 08 24 87 22 20 5b |.$......|...$." [|
|000032f0| 63 6f 6e 74 72 6f 6c 2d | 62 75 66 20 67 65 74 2d |control-|buf get-|
|00003300| 62 75 66 66 65 72 20 62 | 75 66 66 65 72 2d 6e 61 |buffer b|uffer-na|
|00003310| 6d 65 20 74 20 65 64 69 | 66 66 2d 6d 75 6c 74 69 |me t edi|ff-multi|
|00003320| 66 72 61 6d 65 20 74 68 | 69 73 2d 63 6f 6d 6d 61 |frame th|is-comma|
|00003330| 6e 64 20 65 64 69 66 66 | 2d 71 75 69 74 20 65 72 |nd ediff|-quit er|
|00003340| 72 6f 72 20 65 64 69 66 | 66 2d 4b 49 4c 4c 45 44 |ror edif|f-KILLED|
|00003350| 2d 56 49 54 41 4c 2d 42 | 55 46 46 45 52 20 65 64 |-VITAL-B|UFFER ed|
|00003360| 69 66 66 2d 6d 65 72 67 | 65 2d 6a 6f 62 20 65 64 |iff-merg|e-job ed|
|00003370| 69 66 66 2d 73 65 74 75 | 70 2d 77 69 6e 64 6f 77 |iff-setu|p-window|
|00003380| 73 2d 6d 75 6c 74 69 66 | 72 61 6d 65 2d 6d 65 72 |s-multif|rame-mer|
|00003390| 67 65 20 62 75 66 2d 41 | 20 62 75 66 2d 42 20 62 |ge buf-A| buf-B b|
|000033a0| 75 66 2d 43 20 65 64 69 | 66 66 2d 73 65 74 75 70 |uf-C edi|ff-setup|
|000033b0| 2d 77 69 6e 64 6f 77 73 | 2d 6d 75 6c 74 69 66 72 |-windows|-multifr|
|000033c0| 61 6d 65 2d 63 6f 6d 70 | 61 72 65 5d 20 35 5d 29 |ame-comp|are] 5])|
|000033d0| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|000033e0| 66 2d 73 65 74 75 70 2d | 77 69 6e 64 6f 77 73 2d |f-setup-|windows-|
|000033f0| 6d 75 6c 74 69 66 72 61 | 6d 65 2d 6d 65 72 67 65 |multifra|me-merge|
|00003400| 20 23 5b 28 62 75 66 2d | 41 20 62 75 66 2d 42 20 | #[(buf-|A buf-B |
|00003410| 62 75 66 2d 43 20 63 6f | 6e 74 72 6f 6c 2d 62 75 |buf-C co|ntrol-bu|
|00003420| 66 29 20 22 c0 c1 21 88 | c2 1b c4 0d 21 1e 06 c4 |f) "..!.|....!...|
|00003430| 0e 07 21 1e 08 c4 0e 09 | 21 1e 5c 6e 0e 06 ad 84 |..!.....|!.\n....|
|00003440| cb 0e 06 21 1e 0c 0e 08 | ad 84 cb 0e 08 21 1e 0d |...!....|.....!..|
|00003450| 0e 5c 6e ad 84 cb 0e 5c | 6e 21 1e 0e 0e 0f ab 98 |.\n....\|n!......|
|00003460| d0 0e 0f 21 ab 92 d1 d0 | 0e 0f 21 21 ab 8a 72 0e |...!....|..!!..r.|
|00003470| 0f 71 88 0e 12 29 aa 8a | 0e 13 d4 61 ae 84 d5 0e |.q...)..|...a....|
|00003480| 16 21 1e 17 0e 0f ab 98 | d0 0e 0f 21 ab 92 d1 d0 |.!......|...!....|
|00003490| 0e 0f 21 21 ab 8a 72 0e | 0f 71 88 0e 18 29 aa 8a |..!!..r.|.q...)..|
|000034a0| 0e 13 d4 61 ae 84 d5 0e | 16 21 1e 19 da 20 1e 1b |...a....|.!... ..|
|000034b0| dc 20 1e 1d 0e 17 ae be | 0e 0c 0e 0e ae 82 0e 1d |. ......|........|
|000034c0| 61 ae b3 0e 0d 0e 0e ae | 82 0e 1d 61 ae a8 de 0e |a.......|...a....|
|000034d0| 0c 21 3f ae a1 de 0e 0d | 21 3f ae 9a df 0e 06 21 |.!?.....|!?.....!|
|000034e0| 3f ae 93 df 0e 08 21 3f | ae 8c 0e 0c 0e 0d 61 ad |?.....!?|......a.|
|000034f0| 85 de 0e 0e 21 3f 89 1e | 20 3f ad 85 0e 0c 0e 0d |....!?..| ?......|
|00003500| 61 1e 21 0e 0f ab 98 d0 | 0e 0f 21 ab 92 d1 d0 0e |a.!.....|..!.....|
|00003510| 0f 21 21 ab 8a 72 0e 0f | 71 88 0e 5c 22 29 aa 8a |.!!..r..|q..\")..|
|00003520| 0e 13 d4 61 ae 84 d5 0e | 16 21 1e 23 e4 1e 25 e4 |...a....|.!.#..%.|
|00003530| 1e 26 e4 1e 27 e4 1e 28 | e4 1e 29 ea 0e 06 21 ab |.&..'..(|..)...!.|
|00003540| 97 0e 20 ac 93 0e 21 ac | 8f eb 0e 06 21 88 ec 20 |.. ...!.|....!.. |
|00003550| 88 da 20 16 06 ed 16 27 | ea 0e 08 21 ab 97 0e 20 |.. ....'|...!... |
|00003560| ac 93 0e 21 ac 8f eb 0e | 08 21 88 ec 20 88 da 20 |...!....|.!.. .. |
|00003570| 16 08 ed 16 28 ea 0e 5c | 6e 21 ab 99 df 0e 5c 6e |....(..\|n!....\n|
|00003580| 21 ab 93 0e 20 ac 8f eb | 0e 5c 6e 21 88 ec 20 88 |!... ...|.\n!.. .|
|00003590| da 20 16 5c 6e ed 16 29 | 0e 21 ab b0 ea 0e 06 21 |. .\n..)|.!.....!|
|000035a0| ab aa eb 0e 06 21 88 ec | 20 88 da 20 16 06 0e 19 |.....!..| .. ....|
|000035b0| 20 88 da 20 0e 06 61 ab | 84 ee c2 21 88 ef 0e 07 | .. ..a.|...!....|
|000035c0| 21 88 da 20 16 08 ed 16 | 27 ed 16 28 0e 20 ab fb |!.. ....|'..(. ..|
|000035d0| c2 1b 0e 0c 0e 0d 61 ab | 94 0e 0d 0e 0e 61 ab 8d |......a.|.....a..|
|000035e0| de 0e 0c 21 ab 87 f0 0e | 0c 21 88 aa 83 c0 20 88 |...!....|.!.... .|
|000035f0| ec 20 88 f1 f2 f3 20 0e | 23 5f 21 5d 16 25 ef 0d |. .... .|#_!].%..|
|00003600| 21 88 da 20 16 06 f4 f1 | f3 20 0e 25 5a 5d 21 88 |!.. ....|. .%Z]!.|
|00003610| da 20 0e 06 61 ab 84 ee | c2 21 88 da 20 16 5c 6e |. ..a...|.!.. .\n|
|00003620| ef 0e 09 21 88 eb 0e 06 | 21 88 0e 19 20 88 da 20 |...!....|!... .. |
|00003630| 0e 06 61 ab 84 ee c2 21 | 88 ef 0e 07 21 88 da 20 |..a....!|....!.. |
|00003640| 16 08 ed 16 27 ed 16 28 | ed 16 29 29 0e 27 ac 90 |....'..(|..)).'..|
|00003650| eb 0e 1b 21 88 ec 20 88 | ef 0d 21 88 da 20 16 06 |...!.. .|..!.. ..|
|00003660| 0e 28 ac 91 eb 0e 1b 21 | 88 ec 20 88 ef 0e 07 21 |.(.....!|.. ....!|
|00003670| 88 da 20 16 08 0e 29 ac | 91 eb 0e 1b 21 88 ec 20 |.. ...).|....!.. |
|00003680| 88 ef 0e 09 21 88 da 20 | 16 5c 6e 0e 0f ab b0 d0 |....!.. |.\n.....|
|00003690| 0e 0f 21 ab aa d1 d0 0e | 0f 21 21 ab a2 72 0e 0f |..!.....|.!!..r..|
|000036a0| 71 88 0e 06 16 35 0e 08 | 16 36 0e 5c 6e 16 37 cb |q....5..|.6.\n.7.|
|000036b0| 0e 35 21 16 0c cb f8 0e | 0c 21 21 16 26 29 aa 8b |.5!.....|.!!.&)..|
|000036c0| 0e 13 d4 61 ac 85 d5 0e | 16 21 88 f9 0e 0f 0e 26 |...a....|.!.....&|
|000036d0| 5c 22 2e 13 87 22 20 5b | 65 64 69 66 66 2d 73 6b |\"..." [|ediff-sk|
|000036e0| 69 70 2d 75 6e 73 75 69 | 74 61 62 6c 65 2d 66 72 |ip-unsui|table-fr|
|000036f0| 61 6d 65 73 20 6f 6b 2d | 75 6e 73 70 6c 69 74 74 |ames ok-|unsplitt|
|00003700| 61 62 6c 65 20 31 20 77 | 69 6e 64 6f 77 2d 6d 69 |able 1 w|indow-mi|
|00003710| 6e 2d 68 65 69 67 68 74 | 20 65 64 69 66 66 2d 67 |n-height| ediff-g|
|00003720| 65 74 2d 76 69 73 69 62 | 6c 65 2d 62 75 66 66 65 |et-visib|le-buffe|
|00003730| 72 2d 77 69 6e 64 6f 77 | 20 62 75 66 2d 41 20 77 |r-window| buf-A w|
|00003740| 69 6e 64 2d 41 20 62 75 | 66 2d 42 20 77 69 6e 64 |ind-A bu|f-B wind|
|00003750| 2d 42 20 62 75 66 2d 43 | 20 77 69 6e 64 2d 43 20 |-B buf-C| wind-C |
|00003760| 77 69 6e 64 6f 77 2d 66 | 72 61 6d 65 20 66 72 61 |window-f|rame fra|
|00003770| 6d 65 2d 41 20 66 72 61 | 6d 65 2d 42 20 66 72 61 |me-A fra|me-B fra|
|00003780| 6d 65 2d 43 20 63 6f 6e | 74 72 6f 6c 2d 62 75 66 |me-C con|trol-buf|
|00003790| 20 67 65 74 2d 62 75 66 | 66 65 72 20 62 75 66 66 | get-buf|fer buff|
|000037a0| 65 72 2d 6e 61 6d 65 20 | 65 64 69 66 66 2d 77 69 |er-name |ediff-wi|
|000037b0| 64 65 2d 64 69 73 70 6c | 61 79 2d 70 20 74 68 69 |de-displ|ay-p thi|
|000037c0| 73 2d 63 6f 6d 6d 61 6e | 64 20 65 64 69 66 66 2d |s-comman|d ediff-|
|000037d0| 71 75 69 74 20 65 72 72 | 6f 72 20 65 64 69 66 66 |quit err|or ediff|
|000037e0| 2d 4b 49 4c 4c 45 44 2d | 56 49 54 41 4c 2d 42 55 |-KILLED-|VITAL-BU|
|000037f0| 46 46 45 52 20 66 6f 72 | 63 65 2d 6f 6e 65 2d 66 |FFER for|ce-one-f|
|00003800| 72 61 6d 65 20 65 64 69 | 66 66 2d 73 70 6c 69 74 |rame edi|ff-split|
|00003810| 2d 77 69 6e 64 6f 77 2d | 66 75 6e 63 74 69 6f 6e |-window-|function|
|00003820| 20 73 70 6c 69 74 2d 77 | 69 6e 64 6f 77 2d 66 75 | split-w|indow-fu|
|00003830| 6e 63 74 69 6f 6e 20 73 | 65 6c 65 63 74 65 64 2d |nction s|elected-|
|00003840| 77 69 6e 64 6f 77 20 6f | 72 69 67 2d 77 69 6e 64 |window o|rig-wind|
|00003850| 20 73 65 6c 65 63 74 65 | 64 2d 66 72 61 6d 65 20 | selecte|d-frame |
|00003860| 6f 72 69 67 2d 66 72 61 | 6d 65 20 66 72 61 6d 65 |orig-fra|me frame|
|00003870| 2d 6c 69 76 65 2d 70 20 | 65 64 69 66 66 2d 77 69 |-live-p |ediff-wi|
|00003880| 6e 64 6f 77 2d 6f 6b 2d | 66 6f 72 2d 64 69 73 70 |ndow-ok-|for-disp|
|00003890| 6c 61 79 20 75 73 65 2d | 73 61 6d 65 2d 66 72 61 |lay use-|same-fra|
|000038a0| 6d 65 20 75 73 65 2d 73 | 61 6d 65 2d 66 72 61 6d |me use-s|ame-fram|
|000038b0| 65 2d 66 6f 72 2d 41 42 | 20 65 64 69 66 66 2d 6d |e-for-AB| ediff-m|
|000038c0| 65 72 67 65 2d 77 69 6e | 64 6f 77 2d 73 68 61 72 |erge-win|dow-shar|
|000038d0| 65 20 6d 65 72 67 65 2d | 77 69 6e 64 6f 77 2d 73 |e merge-|window-s|
|000038e0| 68 61 72 65 20 6e 69 6c | 20 6d 65 72 67 65 2d 77 |hare nil| merge-w|
|000038f0| 69 6e 64 6f 77 2d 6c 69 | 6e 65 73 20 64 65 73 69 |indow-li|nes desi|
|00003900| 67 6e 61 74 65 64 2d 6d | 69 6e 69 62 75 66 66 65 |gnated-m|inibuffe|
|00003910| 72 2d 66 72 61 6d 65 20 | 64 6f 6e 65 2d 41 20 64 |r-frame |done-A d|
|00003920| 6f 6e 65 2d 42 20 64 6f | 6e 65 2d 43 20 77 69 6e |one-B do|ne-C win|
|00003930| 64 6f 77 2d 6c 69 76 65 | 2d 70 20 73 65 6c 65 63 |dow-live|-p selec|
|00003940| 74 2d 77 69 6e 64 6f 77 | 20 64 65 6c 65 74 65 2d |t-window| delete-|
|00003950| 6f 74 68 65 72 2d 77 69 | 6e 64 6f 77 73 20 74 20 |other-wi|ndows t |
|00003960| 6f 74 68 65 72 2d 77 69 | 6e 64 6f 77 20 73 77 69 |other-wi|ndow swi|
|00003970| 74 63 68 2d 74 6f 2d 62 | 75 66 66 65 72 20 73 65 |tch-to-b|uffer se|
|00003980| 6c 65 63 74 2d 66 72 61 | 6d 65 20 32 20 72 6f 75 |lect-fra|me 2 rou|
|00003990| 6e 64 20 77 69 6e 64 6f | 77 2d 68 65 69 67 68 74 |nd windo|w-height|
|000039a0| 20 73 70 6c 69 74 2d 77 | 69 6e 64 6f 77 2d 76 65 | split-w|indow-ve|
|000039b0| 72 74 69 63 61 6c 6c 79 | 20 65 64 69 66 66 2d 77 |rtically| ediff-w|
|000039c0| 69 6e 64 6f 77 2d 41 20 | 65 64 69 66 66 2d 77 69 |indow-A |ediff-wi|
|000039d0| 6e 64 6f 77 2d 42 20 65 | 64 69 66 66 2d 77 69 6e |ndow-B e|diff-win|
|000039e0| 64 6f 77 2d 43 20 6d 69 | 6e 69 62 75 66 66 65 72 |dow-C mi|nibuffer|
|000039f0| 2d 77 69 6e 64 6f 77 20 | 65 64 69 66 66 2d 73 65 |-window |ediff-se|
|00003a00| 74 75 70 2d 63 6f 6e 74 | 72 6f 6c 2d 66 72 61 6d |tup-cont|rol-fram|
|00003a10| 65 5d 20 35 5d 29 0a 28 | 64 65 66 61 6c 69 61 73 |e] 5]).(|defalias|
|00003a20| 20 27 65 64 69 66 66 2d | 73 65 74 75 70 2d 77 69 | 'ediff-|setup-wi|
|00003a30| 6e 64 6f 77 73 2d 6d 75 | 6c 74 69 66 72 61 6d 65 |ndows-mu|ltiframe|
|00003a40| 2d 63 6f 6d 70 61 72 65 | 20 23 5b 28 62 75 66 2d |-compare| #[(buf-|
|00003a50| 41 20 62 75 66 2d 42 20 | 62 75 66 2d 43 20 63 6f |A buf-B |buf-C co|
|00003a60| 6e 74 72 6f 6c 2d 62 75 | 66 29 20 22 c0 c1 21 88 |ntrol-bu|f) "..!.|
|00003a70| c2 1b c4 0d 21 1e 06 c4 | 0e 07 21 1e 08 c4 0e 09 |....!...|..!.....|
|00003a80| 21 1e 5c 6e 0e 06 ad 84 | cb 0e 06 21 1e 0c 0e 08 |!.\n....|...!....|
|00003a90| ad 84 cb 0e 08 21 1e 0d | 0e 5c 6e ad 84 cb 0e 5c |.....!..|.\n....\|
|00003aa0| 6e 21 1e 0e 0e 0f ab 9a | d0 0e 0f 21 ab 94 d1 d0 |n!......|...!....|
|00003ab0| 0e 0f 21 21 ab 8c 72 0e | 0f 71 88 d2 0e 13 21 29 |..!!..r.|.q....!)|
|00003ac0| aa 8a 0e 14 d5 61 ae 84 | d6 0e 17 21 1e 18 0e 0f |.....a..|...!....|
|00003ad0| ab 98 d0 0e 0f 21 ab 92 | d1 d0 0e 0f 21 21 ab 8a |.....!..|....!!..|
|00003ae0| 72 0e 0f 71 88 0e 19 29 | aa 8a 0e 14 d5 61 ae 84 |r..q...)|.....a..|
|00003af0| d6 0e 17 21 1e 1a 0e 0f | ab 98 d0 0e 0f 21 ab 92 |...!....|.....!..|
|00003b00| d1 d0 0e 0f 21 21 ab 8a | 72 0e 0f 71 88 0e 1b 29 |....!!..|r..q...)|
|00003b10| aa 8a 0e 14 d5 61 ae 84 | d6 0e 17 21 1e 1c 0e 0f |.....a..|...!....|
|00003b20| ab 98 d0 0e 0f 21 ab 92 | d1 d0 0e 0f 21 21 ab 8a |.....!..|....!!..|
|00003b30| 72 0e 0f 71 88 0e 1d 29 | aa 8a 0e 14 d5 61 ae 84 |r..q...)|.....a..|
|00003b40| d6 0e 17 21 1e 1e df 20 | 1e 20 0e 1a ae e4 0e 0c |...!... |. ......|
|00003b50| 0e 0d 61 ae dd e1 0e 06 | 21 3f ae d6 e1 0e 08 21 |..a.....|!?.....!|
|00003b60| 3f ae cf 0e 1e ab aa 0e | 0c 0e 0e 61 ae c4 0e 0d |?.......|...a....|
|00003b70| 0e 0e 61 ae bd e1 0e 5c | 6e 21 3f ae b6 d2 0e 0c |..a....\|n!?.....|
|00003b80| 21 3f ae af d2 0e 0d 21 | 3f ae a8 d2 0e 0e 21 3f |!?.....!|?.....!?|
|00003b90| ae a1 d2 0e 0d 21 ac 8b | 0e 18 ae 97 0e 0c e2 20 |.....!..|....... |
|00003ba0| 61 ae 90 d2 0e 0c 21 3f | ad 89 0e 18 ae 85 0e 0d |a.....!?|........|
|00003bb0| e2 20 61 1e 23 e4 1e 25 | e4 1e 26 e4 1e 27 e4 1e |. a.#..%|..&..'..|
|00003bc0| 28 e4 1e 29 e4 1e 2a 0e | 0f ab cf d0 0e 0f 21 ab |(..)..*.|......!.|
|00003bd0| c9 d1 d0 0e 0f 21 21 ab | c1 72 0e 0f 71 88 0e 2b |.....!!.|.r..q..+|
|00003be0| 40 1e 2c ed 0e 2c 21 ad | 8e 0e 2e ab 86 ef 0e 2c |@.,..,!.|.......,|
|00003bf0| 21 aa 84 f0 0e 2c 21 29 | 16 25 0e 2b 41 40 1e 2c |!....,!)|.%.+A@.,|
|00003c00| ed 0e 2c 21 ad 8e 0e 2e | ab 86 ef 0e 2c 21 aa 84 |..,!....|....,!..|
|00003c10| f0 0e 2c 21 29 16 26 29 | aa 8b 0e 14 d5 61 ac 85 |..,!).&)|.....a..|
|00003c20| d6 0e 17 21 88 f1 0e 06 | 21 ab 93 0e 23 ac 8f f2 |...!....|!...#...|
|00003c30| 0e 06 21 88 f3 20 88 df | 20 16 06 f4 16 28 f1 0e |..!.. ..| ....(..|
|00003c40| 08 21 ab 93 0e 23 ac 8f | f2 0e 08 21 88 f3 20 88 |.!...#..|...!.. .|
|00003c50| df 20 16 08 f4 16 29 f1 | 0e 5c 6e 21 ab 93 0e 23 |. ....).|.\n!...#|
|00003c60| ac 8f f2 0e 5c 6e 21 88 | f3 20 88 df 20 16 5c 6e |....\n!.|. .. .\n|
|00003c70| f4 16 2a 0e 23 83 85 02 | e4 1e 35 0e 0c 0e 0d 61 |..*.#...|..5....a|
|00003c80| ab 8d d2 0e 0c 21 ab 87 | f6 0e 0c 21 88 aa 83 c0 |.....!..|...!....|
|00003c90| 20 88 f3 20 88 f7 0d 21 | 88 df 20 16 06 0e 1e ab | .. ...!|.. .....|
|00003ca0| 94 0e 1c f8 61 ab 86 f9 | 0e 06 21 aa 84 fa 0e 06 |....a...|..!.....|
|00003cb0| 21 fb a5 16 35 0e 1c 0e | 35 21 88 df 20 0e 06 61 |!...5...|5!.. ..a|
|00003cc0| ab 84 fc c2 21 88 f7 0e | 07 21 88 df 20 16 08 0e |....!...|.!.. ...|
|00003cd0| 1e ab 9b 0e 1c 20 88 df | 20 0e 06 0e 08 44 73 ab |..... ..| ....Ds.|
|00003ce0| 84 fc c2 21 88 f7 0e 09 | 21 88 df 20 16 5c 6e f4 |...!....|!.. .\n.|
|00003cf0| 16 28 f4 16 29 f4 16 2a | 29 0e 28 ac 90 f2 0e 20 |.(..)..*|).(.... |
|00003d00| 21 88 f3 20 88 f7 0d 21 | 88 df 20 16 06 0e 29 ac |!.. ...!|.. ...).|
|00003d10| 91 f2 0e 20 21 88 f3 20 | 88 f7 0e 07 21 88 df 20 |... !.. |....!.. |
|00003d20| 16 08 0e 1e ab 95 0e 2a | ac 91 f2 0e 20 21 88 f3 |.......*|.... !..|
|00003d30| 20 88 f7 0e 09 21 88 df | 20 16 5c 6e 0e 0f ab b2 | ....!..| .\n....|
|00003d40| d0 0e 0f 21 ab ac d1 d0 | 0e 0f 21 21 ab a4 72 0e |...!....|..!!..r.|
|00003d50| 0f 71 88 0e 06 16 3d 0e | 08 16 3e 0e 5c 6e 16 3f |.q....=.|..>.\n.?|
|00003d60| cb 0e 3d 21 16 0c cb 81 | 40 00 0e 0c 21 21 16 27 |..=!....|@...!!.'|
|00003d70| 29 aa 8b 0e 14 d5 61 ac | 85 d6 0e 17 21 88 0e 41 |).....a.|....!..A|
|00003d80| ab 92 81 42 00 0e 06 0e | 25 5c 22 88 81 42 00 0e |...B....|%\"..B..|
|00003d90| 08 0e 26 5c 22 88 81 43 | 00 0e 0f 0e 27 5c 22 2e |..&\"..C|....'\".|
|00003da0| 13 87 22 20 5b 65 64 69 | 66 66 2d 73 6b 69 70 2d |.." [edi|ff-skip-|
|00003db0| 75 6e 73 75 69 74 61 62 | 6c 65 2d 66 72 61 6d 65 |unsuitab|le-frame|
|00003dc0| 73 20 6f 6b 2d 75 6e 73 | 70 6c 69 74 74 61 62 6c |s ok-uns|plittabl|
|00003dd0| 65 20 31 20 77 69 6e 64 | 6f 77 2d 6d 69 6e 2d 68 |e 1 wind|ow-min-h|
|00003de0| 65 69 67 68 74 20 65 64 | 69 66 66 2d 67 65 74 2d |eight ed|iff-get-|
|00003df0| 76 69 73 69 62 6c 65 2d | 62 75 66 66 65 72 2d 77 |visible-|buffer-w|
|00003e00| 69 6e 64 6f 77 20 62 75 | 66 2d 41 20 77 69 6e 64 |indow bu|f-A wind|
|00003e10| 2d 41 20 62 75 66 2d 42 | 20 77 69 6e 64 2d 42 20 |-A buf-B| wind-B |
|00003e20| 62 75 66 2d 43 20 77 69 | 6e 64 2d 43 20 77 69 6e |buf-C wi|nd-C win|
|00003e30| 64 6f 77 2d 66 72 61 6d | 65 20 66 72 61 6d 65 2d |dow-fram|e frame-|
|00003e40| 41 20 66 72 61 6d 65 2d | 42 20 66 72 61 6d 65 2d |A frame-|B frame-|
|00003e50| 43 20 63 6f 6e 74 72 6f | 6c 2d 62 75 66 20 67 65 |C contro|l-buf ge|
|00003e60| 74 2d 62 75 66 66 65 72 | 20 62 75 66 66 65 72 2d |t-buffer| buffer-|
|00003e70| 6e 61 6d 65 20 66 72 61 | 6d 65 2d 6c 69 76 65 2d |name fra|me-live-|
|00003e80| 70 20 65 64 69 66 66 2d | 63 6f 6e 74 72 6f 6c 2d |p ediff-|control-|
|00003e90| 66 72 61 6d 65 20 74 68 | 69 73 2d 63 6f 6d 6d 61 |frame th|is-comma|
|00003ea0| 6e 64 20 65 64 69 66 66 | 2d 71 75 69 74 20 65 72 |nd ediff|-quit er|
|00003eb0| 72 6f 72 20 65 64 69 66 | 66 2d 4b 49 4c 4c 45 44 |ror edif|f-KILLED|
|00003ec0| 2d 56 49 54 41 4c 2d 42 | 55 46 46 45 52 20 63 74 |-VITAL-B|UFFER ct|
|00003ed0| 6c 2d 66 72 61 6d 65 2d | 65 78 69 73 74 73 2d 70 |l-frame-|exists-p|
|00003ee0| 20 65 64 69 66 66 2d 77 | 69 64 65 2d 64 69 73 70 | ediff-w|ide-disp|
|00003ef0| 6c 61 79 2d 70 20 66 6f | 72 63 65 2d 6f 6e 65 2d |lay-p fo|rce-one-|
|00003f00| 66 72 61 6d 65 20 65 64 | 69 66 66 2d 73 70 6c 69 |frame ed|iff-spli|
|00003f10| 74 2d 77 69 6e 64 6f 77 | 2d 66 75 6e 63 74 69 6f |t-window|-functio|
|00003f20| 6e 20 73 70 6c 69 74 2d | 77 69 6e 64 6f 77 2d 66 |n split-|window-f|
|00003f30| 75 6e 63 74 69 6f 6e 20 | 65 64 69 66 66 2d 33 77 |unction |ediff-3w|
|00003f40| 61 79 2d 63 6f 6d 70 61 | 72 69 73 6f 6e 2d 6a 6f |ay-compa|rison-jo|
|00003f50| 62 20 74 68 72 65 65 2d | 77 61 79 2d 63 6f 6d 70 |b three-|way-comp|
|00003f60| 61 72 69 73 6f 6e 20 73 | 65 6c 65 63 74 65 64 2d |arison s|elected-|
|00003f70| 77 69 6e 64 6f 77 20 6f | 72 69 67 2d 77 69 6e 64 |window o|rig-wind|
|00003f80| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 2d 6f 6b | ediff-w|indow-ok|
|00003f90| 2d 66 6f 72 2d 64 69 73 | 70 6c 61 79 20 73 65 6c |-for-dis|play sel|
|00003fa0| 65 63 74 65 64 2d 66 72 | 61 6d 65 20 75 73 65 2d |ected-fr|ame use-|
|00003fb0| 73 61 6d 65 2d 66 72 61 | 6d 65 20 6e 69 6c 20 77 |same-fra|me nil w|
|00003fc0| 69 6e 64 2d 41 2d 73 74 | 61 72 74 20 77 69 6e 64 |ind-A-st|art wind|
|00003fd0| 2d 42 2d 73 74 61 72 74 | 20 64 65 73 69 67 6e 61 |-B-start| designa|
|00003fe0| 74 65 64 2d 6d 69 6e 69 | 62 75 66 66 65 72 2d 66 |ted-mini|buffer-f|
|00003ff0| 72 61 6d 65 20 64 6f 6e | 65 2d 41 20 64 6f 6e 65 |rame don|e-A done|
|00004000| 2d 42 20 64 6f 6e 65 2d | 43 20 65 64 69 66 66 2d |-B done-|C ediff-|
|00004010| 6e 61 72 72 6f 77 2d 62 | 6f 75 6e 64 73 20 6f 76 |narrow-b|ounds ov|
|00004020| 65 72 6c 20 65 64 69 66 | 66 2d 6f 76 65 72 6c 61 |erl edif|f-overla|
|00004030| 79 70 20 65 64 69 66 66 | 2d 65 6d 61 63 73 2d 70 |yp ediff|-emacs-p|
|00004040| 20 6f 76 65 72 6c 61 79 | 2d 73 74 61 72 74 20 65 | overlay|-start e|
|00004050| 78 74 65 6e 74 2d 73 74 | 61 72 74 2d 70 6f 73 69 |xtent-st|art-posi|
|00004060| 74 69 6f 6e 20 77 69 6e | 64 6f 77 2d 6c 69 76 65 |tion win|dow-live|
|00004070| 2d 70 20 73 65 6c 65 63 | 74 2d 77 69 6e 64 6f 77 |-p selec|t-window|
|00004080| 20 64 65 6c 65 74 65 2d | 6f 74 68 65 72 2d 77 69 | delete-|other-wi|
|00004090| 6e 64 6f 77 73 20 74 20 | 77 69 6e 64 2d 77 69 64 |ndows t |wind-wid|
|000040a0| 74 68 2d 6f 72 2d 68 65 | 69 67 68 74 20 73 65 6c |th-or-he|ight sel|
|000040b0| 65 63 74 2d 66 72 61 6d | 65 20 73 77 69 74 63 68 |ect-fram|e switch|
|000040c0| 2d 74 6f 2d 62 75 66 66 | 65 72 20 73 70 6c 69 74 |-to-buff|er split|
|000040d0| 2d 77 69 6e 64 6f 77 2d | 76 65 72 74 69 63 61 6c |-window-|vertical|
|000040e0| 6c 79 20 77 69 6e 64 6f | 77 2d 68 65 69 67 68 74 |ly windo|w-height|
|000040f0| 20 77 69 6e 64 6f 77 2d | 77 69 64 74 68 20 33 20 | window-|width 3 |
|00004100| 6f 74 68 65 72 2d 77 69 | 6e 64 6f 77 20 65 64 69 |other-wi|ndow edi|
|00004110| 66 66 2d 77 69 6e 64 6f | 77 2d 41 20 65 64 69 66 |ff-windo|w-A edif|
|00004120| 66 2d 77 69 6e 64 6f 77 | 2d 42 20 65 64 69 66 66 |f-window|-B ediff|
|00004130| 2d 77 69 6e 64 6f 77 2d | 43 20 6d 69 6e 69 62 75 |-window-|C minibu|
|00004140| 66 66 65 72 2d 77 69 6e | 64 6f 77 20 65 64 69 66 |ffer-win|dow edif|
|00004150| 66 2d 77 69 6e 64 6f 77 | 73 2d 6a 6f 62 20 73 65 |f-window|s-job se|
|00004160| 74 2d 77 69 6e 64 6f 77 | 2d 73 74 61 72 74 20 65 |t-window|-start e|
|00004170| 64 69 66 66 2d 73 65 74 | 75 70 2d 63 6f 6e 74 72 |diff-set|up-contr|
|00004180| 6f 6c 2d 66 72 61 6d 65 | 5d 20 33 5d 29 0a 28 64 |ol-frame|] 3]).(d|
|00004190| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 73 |efalias |'ediff-s|
|000041a0| 6b 69 70 2d 75 6e 73 75 | 69 74 61 62 6c 65 2d 66 |kip-unsu|itable-f|
|000041b0| 72 61 6d 65 73 20 23 5b | 28 26 6f 70 74 69 6f 6e |rames #[|(&option|
|000041c0| 61 6c 20 6f 6b 2d 75 6e | 73 70 6c 69 74 74 61 62 |al ok-un|splittab|
|000041d0| 6c 65 29 20 22 c0 20 ad | e5 c1 1a c3 20 5c 6e 61 |le) ". .|.... \na|
|000041e0| ac d1 c4 c5 20 21 ac be | c5 20 1e 06 c0 20 ad 96 |.... !..|. ... ..|
|000041f0| c7 0e 06 21 ad 90 0e 08 | ab 86 c9 0e 06 21 aa 86 |...!....|.....!..|
|00004200| ca 0e 06 21 cb 61 29 ac | 9d cc c5 20 21 0e 0d ce |...!.a).|... !...|
|00004210| 5f 57 ac 92 0e 0f ac 9b | c5 20 1e 06 d0 d1 0e 06 |_W......|. ......|
|00004220| 21 b7 41 29 ab 8d 5c 6e | ac 83 c3 20 12 d2 d3 d4 |!.A)..\n|... ....|
|00004230| 5c 22 88 aa 29 c3 20 5c | 6e 61 ad 85 d5 d6 d7 21 |\"..). \|na.....!|
|00004240| 21 29 87 22 20 5b 65 64 | 69 66 66 2d 77 69 6e 64 |!)." [ed|iff-wind|
|00004250| 6f 77 2d 64 69 73 70 6c | 61 79 2d 70 20 6e 69 6c |ow-displ|ay-p nil|
|00004260| 20 6c 61 73 74 2d 77 69 | 6e 64 6f 77 20 73 65 6c | last-wi|ndow sel|
|00004270| 65 63 74 65 64 2d 77 69 | 6e 64 6f 77 20 65 64 69 |ected-wi|ndow edi|
|00004280| 66 66 2d 66 72 61 6d 65 | 2d 68 61 73 2d 64 65 64 |ff-frame|-has-ded|
|00004290| 69 63 61 74 65 64 2d 77 | 69 6e 64 6f 77 73 20 73 |icated-w|indows s|
|000042a0| 65 6c 65 63 74 65 64 2d | 66 72 61 6d 65 20 66 72 |elected-|frame fr|
|000042b0| 61 6d 65 20 66 72 61 6d | 65 2d 6c 69 76 65 2d 70 |ame fram|e-live-p|
|000042c0| 20 65 64 69 66 66 2d 78 | 65 6d 61 63 73 2d 70 20 | ediff-x|emacs-p |
|000042d0| 66 72 61 6d 65 2d 69 63 | 6f 6e 69 66 69 65 64 2d |frame-ic|onified-|
|000042e0| 70 20 66 72 61 6d 65 2d | 76 69 73 69 62 6c 65 2d |p frame-|visible-|
|000042f0| 70 20 69 63 6f 6e 20 66 | 72 61 6d 65 2d 68 65 69 |p icon f|rame-hei|
|00004300| 67 68 74 20 77 69 6e 64 | 6f 77 2d 6d 69 6e 2d 68 |ght wind|ow-min-h|
|00004310| 65 69 67 68 74 20 33 20 | 6f 6b 2d 75 6e 73 70 6c |eight 3 |ok-unspl|
|00004320| 69 74 74 61 62 6c 65 20 | 75 6e 73 70 6c 69 74 74 |ittable |unsplitt|
|00004330| 61 62 6c 65 20 66 72 61 | 6d 65 2d 70 61 72 61 6d |able fra|me-param|
|00004340| 65 74 65 72 73 20 6f 74 | 68 65 72 2d 77 69 6e 64 |eters ot|her-wind|
|00004350| 6f 77 20 31 20 74 20 73 | 65 6c 65 63 74 2d 66 72 |ow 1 t s|elect-fr|
|00004360| 61 6d 65 20 6d 61 6b 65 | 2d 66 72 61 6d 65 20 28 |ame make|-frame (|
|00004370| 28 75 6e 73 70 6c 69 74 | 74 61 62 6c 65 29 29 5d |(unsplit|table))]|
|00004380| 20 33 5d 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 | 3]).(de|falias '|
|00004390| 65 64 69 66 66 2d 66 72 | 61 6d 65 2d 68 61 73 2d |ediff-fr|ame-has-|
|000043a0| 64 65 64 69 63 61 74 65 | 64 2d 77 69 6e 64 6f 77 |dedicate|d-window|
|000043b0| 73 20 23 5b 28 66 72 61 | 6d 65 29 20 22 c0 20 c1 |s #[(fra|me) ". .|
|000043c0| 1a 1b c4 0d 21 88 c6 c7 | c8 0d 23 88 c4 0b 21 88 |....!...|..#...!.|
|000043d0| 5c 6e 2a 87 22 20 5b 73 | 65 6c 65 63 74 65 64 2d |\n*." [s|elected-|
|000043e0| 66 72 61 6d 65 20 6e 69 | 6c 20 61 6e 73 20 63 75 |frame ni|l ans cu|
|000043f0| 72 2d 66 72 20 73 65 6c | 65 63 74 2d 66 72 61 6d |r-fr sel|ect-fram|
|00004400| 65 20 66 72 61 6d 65 20 | 77 61 6c 6b 2d 77 69 6e |e frame |walk-win|
|00004410| 64 6f 77 73 20 23 5b 28 | 77 69 6e 64 29 20 22 c0 |dows #[(|wind) ".|
|00004420| 09 21 ad 83 c2 89 13 87 | 22 20 5b 77 69 6e 64 6f |.!......|" [windo|
|00004430| 77 2d 64 65 64 69 63 61 | 74 65 64 2d 70 20 77 69 |w-dedica|ted-p wi|
|00004440| 6e 64 20 74 20 61 6e 73 | 5d 20 32 5d 20 69 67 6e |nd t ans|] 2] ign|
|00004450| 6f 72 65 2d 6d 69 6e 69 | 62 75 66 66 65 72 5d 20 |ore-mini|buffer] |
|00004460| 34 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |4]).(def|alias 'e|
|00004470| 64 69 66 66 2d 77 69 6e | 64 6f 77 2d 6f 6b 2d 66 |diff-win|dow-ok-f|
|00004480| 6f 72 2d 64 69 73 70 6c | 61 79 20 23 5b 28 77 69 |or-displ|ay #[(wi|
|00004490| 6e 64 29 20 22 c0 09 21 | ad 91 09 c2 09 c3 c4 09 |nd) "..!|........|
|000044a0| 21 23 61 ae 86 c5 c4 09 | 21 21 3f 87 22 20 5b 77 |!#a.....|!!?." [w|
|000044b0| 69 6e 64 6f 77 2d 6c 69 | 76 65 2d 70 20 77 69 6e |indow-li|ve-p win|
|000044c0| 64 20 6e 65 78 74 2d 77 | 69 6e 64 6f 77 20 69 67 |d next-w|indow ig|
|000044d0| 6e 6f 72 65 2d 6d 69 6e | 69 62 75 66 66 65 72 20 |nore-min|ibuffer |
|000044e0| 77 69 6e 64 6f 77 2d 66 | 72 61 6d 65 20 65 64 69 |window-f|rame edi|
|000044f0| 66 66 2d 66 72 61 6d 65 | 2d 68 61 73 2d 64 65 64 |ff-frame|-has-ded|
|00004500| 69 63 61 74 65 64 2d 77 | 69 6e 64 6f 77 73 5d 20 |icated-w|indows] |
|00004510| 36 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |6]).(def|alias 'e|
|00004520| 64 69 66 66 2d 73 65 74 | 75 70 2d 63 6f 6e 74 72 |diff-set|up-contr|
|00004530| 6f 6c 2d 66 72 61 6d 65 | 20 23 5b 28 63 74 6c 2d |ol-frame| #[(ctl-|
|00004540| 62 75 66 66 65 72 20 64 | 65 73 69 67 6e 61 74 65 |buffer d|esignate|
|00004550| 64 2d 6d 69 6e 69 62 75 | 66 66 65 72 2d 66 72 61 |d-minibu|ffer-fra|
|00004560| 6d 65 29 20 22 c0 c1 89 | 89 89 89 89 89 89 89 1a |me) "...|........|
|00004570| 1b 1c 1d 1e 06 1e 07 1e | 08 1e 09 1e 5c 6e 1e 0b |........|....\n..|
|00004580| 0e 0c ab a2 cd 0e 0c 21 | ab 9c ce cd 0e 0c 21 21 |.......!|......!!|
|00004590| ab 94 72 0e 0c 71 88 0e | 0f ab 84 d0 c1 21 88 d1 |..r..q..|.....!..|
|000045a0| d2 21 88 29 aa 8b 0e 13 | d4 61 ac 85 d5 0e 16 21 |.!.)....|.a.....!|
|000045b0| 88 0e 0c ab 98 cd 0e 0c | 21 ab 92 ce cd 0e 0c 21 |........|!......!|
|000045c0| 21 ab 8a 72 0e 0c 71 88 | 0e 17 29 aa 8a 0e 13 d4 |!..r..q.|..).....|
|000045d0| 61 ae 84 d5 0e 16 21 16 | 06 0e 0c ab a9 cd 0e 0c |a.....!.|........|
|000045e0| 21 ab a3 ce cd 0e 0c 21 | 21 ab 9b 72 0e 0c 71 88 |!......!|!..r..q.|
|000045f0| d8 0e 06 21 ab 84 0e 06 | aa 84 d9 0e 1a 21 89 16 |...!....|.....!..|
|00004600| 07 16 17 29 aa 8b 0e 13 | d4 61 ac 85 d5 0e 16 21 |...)....|.a.....!|
|00004610| 88 0e 07 1e 1b dc 20 ad | 96 d8 0e 1b 21 ad 90 0e |...... .|....!...|
|00004620| 0f ab 86 dd 0e 1b 21 aa | 86 de 0e 1b 21 df 61 29 |......!.|....!.a)|
|00004630| 16 5c 6e e0 0e 07 21 88 | e1 e2 20 21 ac 88 e3 20 |.\n...!.|.. !... |
|00004640| 88 e4 0e 0c 21 88 0e 0c | ab a2 cd 0e 0c 21 ab 9c |....!...|.....!..|
|00004650| ce cd 0e 0c 21 21 ab 94 | 72 0e 0c 71 88 e5 e6 21 |....!!..|r..q...!|
|00004660| 88 e5 e7 21 88 e5 e8 21 | 88 29 aa 8b 0e 13 d4 61 |...!...!|.).....a|
|00004670| ac 85 d5 0e 16 21 88 e9 | 0e 0c 21 88 0e 2a 0e 2b |.....!..|..!..*.+|
|00004680| 98 3f 16 09 0e 13 ec 61 | ad 82 0e 09 16 08 ed 65 |.?.....a|.......e|
|00004690| 64 5c 22 54 89 15 14 ee | 20 ef 5c 5c f0 20 5d 13 |d\"T....| .\\. ].|
|000046a0| f1 f2 0e 33 21 42 f4 0b | 42 f5 0c 42 45 12 0e 36 |...3!B..|B..BE..6|
|000046b0| ab 84 f7 5c 6e 42 12 f8 | 20 ab a8 f9 0e 3a 0e 07 |...\nB..| ....:..|
|000046c0| ef 44 5c 22 88 fb fc 21 | 88 f9 0e 3a 0e 07 fc 44 |.D\"...!|...:...D|
|000046d0| 5c 22 88 f9 0e 3d 0e 07 | fc 44 5c 22 88 f9 0e 3e |\"...=..|.D\"...>|
|000046e0| 0e 07 fc 44 5c 22 88 0e | 3f 81 40 00 73 ab 88 81 |...D\"..|?.@.s...|
|000046f0| 41 00 0e 07 5c 6e 5c 22 | 88 81 42 00 0e 07 21 88 |A...\n\"|..B...!.|
|00004700| 65 62 88 81 41 00 0e 07 | 5c 6e 5c 22 88 81 43 00 |eb..A...|\n\"..C.|
|00004710| 0e 07 21 88 e0 0e 07 21 | 88 81 44 00 20 88 0e 45 |..!....!|..D. ..E|
|00004720| ab 91 0e 5c 6e ac 8d 0e | 09 ac 89 81 46 00 0e 07 |...\n...|....F...|
|00004730| 21 88 aa 8f 0e 08 ac 84 | 0e 5c 6e ac 87 81 47 00 |!.......|.\n...G.|
|00004740| 0e 07 21 88 81 48 00 e2 | 20 81 49 00 5c 22 88 81 |..!..H..| .I.\"..|
|00004750| 41 00 0e 07 0e 4a 0e 0c | 0b 0c 23 5c 22 88 dc 20 |A....J..|..#\".. |
|00004760| ab a5 81 4b 00 1e 4c fb | 81 4d 00 21 88 de 0e 07 |...K..L.|.M.!....|
|00004770| 21 ac 93 0e 4c fc 56 ab | 8d 0e 4c 53 16 4c fb 81 |!...L.V.|..LS.L..|
|00004780| 4e 00 21 88 aa 67 29 81 | 4f 00 0e 07 21 ac 94 81 |N.!..g).|O...!...|
|00004790| 50 00 0e 07 0e 13 d4 61 | ae 87 0e 51 81 49 00 61 |P......a|...Q.I.a|
|000047a0| 3f 5c 22 88 0e 0f ab bc | 0e 0c ab ad cd 0e 0c 21 |?\".....|.......!|
|000047b0| ab a7 ce cd 0e 0c 21 21 | ab 9f 72 0e 0c 71 88 81 |......!!|..r..q..|
|000047c0| 52 00 81 53 00 21 88 81 | 54 00 81 53 00 81 55 00 |R..S.!..|T..S..U.|
|000047d0| c1 81 49 00 24 88 29 aa | 8b 0e 13 d4 61 ac 85 d5 |..I.$.).|....a...|
|000047e0| 0e 16 21 88 0e 0c ab 9b | cd 0e 0c 21 ab 95 ce cd |..!.....|...!....|
|000047f0| 0e 0c 21 21 ab 8d 72 0e | 0c 71 88 d1 81 56 00 21 |..!!..r.|.q...V.!|
|00004800| 29 aa 8a 0e 13 d4 61 ae | 84 d5 0e 16 21 2e 5c 6e |).....a.|....!.\n|
|00004810| 87 22 20 5b 31 20 6e 69 | 6c 20 61 64 6a 75 73 74 |." [1 ni|l adjust|
|00004820| 65 64 2d 70 61 72 61 6d | 65 74 65 72 73 20 66 77 |ed-param|eters fw|
|00004830| 69 64 74 68 20 66 68 65 | 69 67 68 74 20 6c 69 6e |idth fhe|ight lin|
|00004840| 65 73 20 6f 6c 64 2d 63 | 74 6c 2d 66 72 61 6d 65 |es old-c|tl-frame|
|00004850| 20 63 74 6c 2d 66 72 61 | 6d 65 20 64 65 69 63 6f | ctl-fra|me deico|
|00004860| 6e 69 66 79 2d 63 74 6c | 2d 66 72 61 6d 65 20 64 |nify-ctl|-frame d|
|00004870| 6f 6e 74 2d 69 63 6f 6e | 69 66 79 2d 63 74 6c 2d |ont-icon|ify-ctl-|
|00004880| 66 72 61 6d 65 20 63 74 | 6c 2d 66 72 61 6d 65 2d |frame ct|l-frame-|
|00004890| 69 63 6f 6e 69 66 69 65 | 64 2d 70 20 77 69 6e 64 |iconifie|d-p wind|
|000048a0| 6f 77 2d 6d 69 6e 2d 68 | 65 69 67 68 74 20 63 74 |ow-min-h|eight ct|
|000048b0| 6c 2d 62 75 66 66 65 72 | 20 67 65 74 2d 62 75 66 |l-buffer| get-buf|
|000048c0| 66 65 72 20 62 75 66 66 | 65 72 2d 6e 61 6d 65 20 |fer buff|er-name |
|000048d0| 65 64 69 66 66 2d 78 65 | 6d 61 63 73 2d 70 20 73 |ediff-xe|macs-p s|
|000048e0| 65 74 2d 62 75 66 66 65 | 72 2d 6d 65 6e 75 62 61 |et-buffe|r-menuba|
|000048f0| 72 20 72 75 6e 2d 68 6f | 6f 6b 73 20 65 64 69 66 |r run-ho|oks edif|
|00004900| 66 2d 62 65 66 6f 72 65 | 2d 73 65 74 75 70 2d 63 |f-before|-setup-c|
|00004910| 6f 6e 74 72 6f 6c 2d 66 | 72 61 6d 65 2d 68 6f 6f |ontrol-f|rame-hoo|
|00004920| 6b 20 74 68 69 73 2d 63 | 6f 6d 6d 61 6e 64 20 65 |k this-c|ommand e|
|00004930| 64 69 66 66 2d 71 75 69 | 74 20 65 72 72 6f 72 20 |diff-qui|t error |
|00004940| 65 64 69 66 66 2d 4b 49 | 4c 4c 45 44 2d 56 49 54 |ediff-KI|LLED-VIT|
|00004950| 41 4c 2d 42 55 46 46 45 | 52 20 65 64 69 66 66 2d |AL-BUFFE|R ediff-|
|00004960| 63 6f 6e 74 72 6f 6c 2d | 66 72 61 6d 65 20 66 72 |control-|frame fr|
|00004970| 61 6d 65 2d 6c 69 76 65 | 2d 70 20 6d 61 6b 65 2d |ame-live|-p make-|
|00004980| 66 72 61 6d 65 20 65 64 | 69 66 66 2d 63 6f 6e 74 |frame ed|iff-cont|
|00004990| 72 6f 6c 2d 66 72 61 6d | 65 2d 70 61 72 61 6d 65 |rol-fram|e-parame|
|000049a0| 74 65 72 73 20 66 72 61 | 6d 65 20 65 64 69 66 66 |ters fra|me ediff|
|000049b0| 2d 77 69 6e 64 6f 77 2d | 64 69 73 70 6c 61 79 2d |-window-|display-|
|000049c0| 70 20 66 72 61 6d 65 2d | 69 63 6f 6e 69 66 69 65 |p frame-|iconifie|
|000049d0| 64 2d 70 20 66 72 61 6d | 65 2d 76 69 73 69 62 6c |d-p fram|e-visibl|
|000049e0| 65 2d 70 20 69 63 6f 6e | 20 73 65 6c 65 63 74 2d |e-p icon| select-|
|000049f0| 66 72 61 6d 65 20 77 69 | 6e 64 6f 77 2d 64 65 64 |frame wi|ndow-ded|
|00004a00| 69 63 61 74 65 64 2d 70 | 20 73 65 6c 65 63 74 65 |icated-p| selecte|
|00004a10| 64 2d 77 69 6e 64 6f 77 | 20 64 65 6c 65 74 65 2d |d-window| delete-|
|00004a20| 6f 74 68 65 72 2d 77 69 | 6e 64 6f 77 73 20 73 77 |other-wi|ndows sw|
|00004a30| 69 74 63 68 2d 74 6f 2d | 62 75 66 66 65 72 20 6d |itch-to-|buffer m|
|00004a40| 61 6b 65 2d 6c 6f 63 61 | 6c 2d 76 61 72 69 61 62 |ake-loca|l-variab|
|00004a50| 6c 65 20 66 72 61 6d 65 | 2d 74 69 74 6c 65 2d 66 |le frame|-title-f|
|00004a60| 6f 72 6d 61 74 20 66 72 | 61 6d 65 2d 69 63 6f 6e |ormat fr|ame-icon|
|00004a70| 2d 74 69 74 6c 65 2d 66 | 6f 72 6d 61 74 20 69 63 |-title-f|ormat ic|
|00004a80| 6f 6e 2d 74 69 74 6c 65 | 2d 66 6f 72 6d 61 74 20 |on-title|-format |
|00004a90| 65 64 69 66 66 2d 73 65 | 74 75 70 2d 63 6f 6e 74 |ediff-se|tup-cont|
|00004aa0| 72 6f 6c 2d 62 75 66 66 | 65 72 20 65 64 69 66 66 |rol-buff|er ediff|
|00004ab0| 2d 68 65 6c 70 2d 6d 65 | 73 73 61 67 65 20 65 64 |-help-me|ssage ed|
|00004ac0| 69 66 66 2d 62 72 69 65 | 66 2d 68 65 6c 70 2d 6d |iff-brie|f-help-m|
|00004ad0| 65 73 73 61 67 65 20 65 | 64 69 66 66 2d 74 6f 67 |essage e|diff-tog|
|00004ae0| 67 6c 65 2d 68 65 6c 70 | 20 63 6f 75 6e 74 2d 6c |gle-help| count-l|
|00004af0| 69 6e 65 73 20 65 64 69 | 66 66 2d 68 65 6c 70 2d |ines edi|ff-help-|
|00004b00| 6d 65 73 73 61 67 65 2d | 6c 69 6e 65 2d 6c 65 6e |message-|line-len|
|00004b10| 67 74 68 20 32 20 65 64 | 69 66 66 2d 63 6f 6d 70 |gth 2 ed|iff-comp|
|00004b20| 75 74 65 2d 74 6f 6f 6c | 62 61 72 2d 77 69 64 74 |ute-tool|bar-widt|
|00004b30| 68 20 6d 69 6e 69 62 75 | 66 66 65 72 20 6d 69 6e |h minibu|ffer min|
|00004b40| 69 62 75 66 66 65 72 2d | 77 69 6e 64 6f 77 20 64 |ibuffer-|window d|
|00004b50| 65 73 69 67 6e 61 74 65 | 64 2d 6d 69 6e 69 62 75 |esignate|d-minibu|
|00004b60| 66 66 65 72 2d 66 72 61 | 6d 65 20 77 69 64 74 68 |ffer-fra|me width|
|00004b70| 20 68 65 69 67 68 74 20 | 65 64 69 66 66 2d 75 73 | height |ediff-us|
|00004b80| 65 2d 6c 6f 6e 67 2d 68 | 65 6c 70 2d 6d 65 73 73 |e-long-h|elp-mess|
|00004b90| 61 67 65 20 28 61 75 74 | 6f 2d 72 61 69 73 65 29 |age (aut|o-raise)|
|00004ba0| 20 65 64 69 66 66 2d 68 | 61 73 2d 74 6f 6f 6c 62 | ediff-h|as-toolb|
|00004bb0| 61 72 2d 73 75 70 70 6f | 72 74 2d 70 20 73 65 74 |ar-suppo|rt-p set|
|00004bc0| 2d 73 70 65 63 69 66 69 | 65 72 20 74 6f 70 2d 74 |-specifi|er top-t|
|00004bd0| 6f 6f 6c 62 61 72 2d 68 | 65 69 67 68 74 20 73 69 |oolbar-h|eight si|
|00004be0| 74 2d 66 6f 72 20 30 20 | 6c 65 66 74 2d 74 6f 6f |t-for 0 |left-too|
|00004bf0| 6c 62 61 72 2d 77 69 64 | 74 68 20 72 69 67 68 74 |lbar-wid|th right|
|00004c00| 2d 74 6f 6f 6c 62 61 72 | 2d 77 69 64 74 68 20 73 |-toolbar|-width s|
|00004c10| 79 73 74 65 6d 2d 74 79 | 70 65 20 28 65 6d 78 20 |ystem-ty|pe (emx |
|00004c20| 77 69 6e 64 6f 77 73 2d | 6e 74 20 77 69 6e 64 6f |windows-|nt windo|
|00004c30| 77 73 2d 39 35 29 20 6d | 6f 64 69 66 79 2d 66 72 |ws-95) m|odify-fr|
|00004c40| 61 6d 65 2d 70 61 72 61 | 6d 65 74 65 72 73 20 65 |ame-para|meters e|
|00004c50| 64 69 66 66 2d 6d 61 6b | 65 2d 62 6f 74 74 6f 6d |diff-mak|e-bottom|
|00004c60| 2d 74 6f 6f 6c 62 61 72 | 20 6d 61 6b 65 2d 66 72 |-toolbar| make-fr|
|00004c70| 61 6d 65 2d 76 69 73 69 | 62 6c 65 20 65 64 69 66 |ame-visi|ble edif|
|00004c80| 66 2d 72 65 66 72 65 73 | 68 2d 63 6f 6e 74 72 6f |f-refres|h-contro|
|00004c90| 6c 2d 66 72 61 6d 65 20 | 65 64 69 66 66 2d 70 72 |l-frame |ediff-pr|
|00004ca0| 65 66 65 72 2d 69 63 6f | 6e 69 66 69 65 64 2d 63 |efer-ico|nified-c|
|00004cb0| 6f 6e 74 72 6f 6c 2d 66 | 72 61 6d 65 20 69 63 6f |ontrol-f|rame ico|
|00004cc0| 6e 69 66 79 2d 66 72 61 | 6d 65 20 72 61 69 73 65 |nify-fra|me raise|
|00004cd0| 2d 66 72 61 6d 65 20 73 | 65 74 2d 77 69 6e 64 6f |-frame s|et-windo|
|00004ce0| 77 2d 64 65 64 69 63 61 | 74 65 64 2d 70 20 74 20 |w-dedica|ted-p t |
|00004cf0| 65 64 69 66 66 2d 63 6f | 6e 74 72 6f 6c 2d 66 72 |ediff-co|ntrol-fr|
|00004d00| 61 6d 65 2d 70 6f 73 69 | 74 69 6f 6e 2d 66 75 6e |ame-posi|tion-fun|
|00004d10| 63 74 69 6f 6e 20 37 20 | 63 6f 75 6e 74 20 30 2e |ction 7 |count 0.|
|00004d20| 31 20 30 2e 33 20 65 64 | 69 66 66 2d 66 72 61 6d |1 0.3 ed|iff-fram|
|00004d30| 65 2d 69 63 6f 6e 69 66 | 69 65 64 2d 70 20 65 64 |e-iconif|ied-p ed|
|00004d40| 69 66 66 2d 72 65 73 65 | 74 2d 6d 6f 75 73 65 20 |iff-rese|t-mouse |
|00004d50| 65 64 69 66 66 2d 67 72 | 61 62 2d 6d 6f 75 73 65 |ediff-gr|ab-mouse|
|00004d60| 20 6d 61 6b 65 2d 6c 6f | 63 61 6c 2d 68 6f 6f 6b | make-lo|cal-hook|
|00004d70| 20 73 65 6c 65 63 74 2d | 66 72 61 6d 65 2d 68 6f | select-|frame-ho|
|00004d80| 6f 6b 20 61 64 64 2d 68 | 6f 6f 6b 20 65 64 69 66 |ok add-h|ook edif|
|00004d90| 66 2d 78 65 6d 61 63 73 | 2d 73 65 6c 65 63 74 2d |f-xemacs|-select-|
|00004da0| 66 72 61 6d 65 2d 68 6f | 6f 6b 20 65 64 69 66 66 |frame-ho|ok ediff|
|00004db0| 2d 61 66 74 65 72 2d 73 | 65 74 75 70 2d 63 6f 6e |-after-s|etup-con|
|00004dc0| 74 72 6f 6c 2d 66 72 61 | 6d 65 2d 68 6f 6f 6b 5d |trol-fra|me-hook]|
|00004dd0| 20 31 31 5d 29 0a 28 64 | 65 66 61 6c 69 61 73 20 | 11]).(d|efalias |
|00004de0| 27 65 64 69 66 66 2d 64 | 65 73 74 72 6f 79 2d 63 |'ediff-d|estroy-c|
|00004df0| 6f 6e 74 72 6f 6c 2d 66 | 72 61 6d 65 20 23 5b 28 |ontrol-f|rame #[(|
|00004e00| 63 74 6c 2d 62 75 66 66 | 65 72 29 20 22 08 ab b0 |ctl-buff|er) "...|
|00004e10| c1 08 21 ab ab c2 c1 08 | 21 21 ab a4 72 08 71 88 |..!.....|!!..r.q.|
|00004e20| c3 20 ab 99 c4 0d 21 ab | 94 0d 1e 06 0e 07 ab 85 |. ....!.|........|
|00004e30| c8 0e 09 21 88 ca 15 cb | 0e 06 21 88 29 29 aa 8b |...!....|..!.))..|
|00004e40| 0e 0c cd 61 ac 85 ce 0e | 0f 21 88 d0 20 87 22 20 |...a....|.!.. ." |
|00004e50| 5b 63 74 6c 2d 62 75 66 | 66 65 72 20 67 65 74 2d |[ctl-buf|fer get-|
|00004e60| 62 75 66 66 65 72 20 62 | 75 66 66 65 72 2d 6e 61 |buffer b|uffer-na|
|00004e70| 6d 65 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 2d |me ediff|-window-|
|00004e80| 64 69 73 70 6c 61 79 2d | 70 20 66 72 61 6d 65 2d |display-|p frame-|
|00004e90| 6c 69 76 65 2d 70 20 65 | 64 69 66 66 2d 63 6f 6e |live-p e|diff-con|
|00004ea0| 74 72 6f 6c 2d 66 72 61 | 6d 65 20 63 74 6c 2d 66 |trol-fra|me ctl-f|
|00004eb0| 72 61 6d 65 20 65 64 69 | 66 66 2d 78 65 6d 61 63 |rame edi|ff-xemac|
|00004ec0| 73 2d 70 20 73 65 74 2d | 62 75 66 66 65 72 2d 6d |s-p set-|buffer-m|
|00004ed0| 65 6e 75 62 61 72 20 64 | 65 66 61 75 6c 74 2d 6d |enubar d|efault-m|
|00004ee0| 65 6e 75 62 61 72 20 6e | 69 6c 20 64 65 6c 65 74 |enubar n|il delet|
|00004ef0| 65 2d 66 72 61 6d 65 20 | 74 68 69 73 2d 63 6f 6d |e-frame |this-com|
|00004f00| 6d 61 6e 64 20 65 64 69 | 66 66 2d 71 75 69 74 20 |mand edi|ff-quit |
|00004f10| 65 72 72 6f 72 20 65 64 | 69 66 66 2d 4b 49 4c 4c |error ed|iff-KILL|
|00004f20| 45 44 2d 56 49 54 41 4c | 2d 42 55 46 46 45 52 20 |ED-VITAL|-BUFFER |
|00004f30| 65 64 69 66 66 2d 73 6b | 69 70 2d 75 6e 73 75 69 |ediff-sk|ip-unsui|
|00004f40| 74 61 62 6c 65 2d 66 72 | 61 6d 65 73 5d 20 33 5d |table-fr|ames] 3]|
|00004f50| 29 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |).(defal|ias 'edi|
|00004f60| 66 66 2d 6d 61 6b 65 2d | 66 72 61 6d 65 2d 70 6f |ff-make-|frame-po|
|00004f70| 73 69 74 69 6f 6e 20 23 | 5b 28 63 74 6c 2d 62 75 |sition #|[(ctl-bu|
|00004f80| 66 66 65 72 20 63 74 6c | 2d 66 72 61 6d 65 2d 77 |ffer ctl|-frame-w|
|00004f90| 69 64 74 68 20 63 74 6c | 2d 66 72 61 6d 65 2d 68 |idth ctl|-frame-h|
|00004fa0| 65 69 67 68 74 29 20 22 | 08 83 5c 22 01 c1 08 21 |eight) "|..\"...!|
|00004fb0| 83 5c 22 01 c2 c1 08 21 | 21 83 5c 22 01 72 08 71 |.\"....!|!.\".r.q|
|00004fc0| 88 c3 0c 21 1d c6 0d 21 | 1e 07 c8 c9 ca 0e 07 5c |...!...!|.......\|
|00004fd0| 22 41 21 1e 0b c8 c9 cc | 0e 07 5c 22 41 21 1e 0d |"A!.....|..\"A!..|
|00004fe0| ce 0d 21 1e 0f 0e 10 1e | 11 d2 1e 13 d2 1e 14 d2 |..!.....|........|
|00004ff0| 1e 15 d2 1e 16 0e 17 89 | 5c 5c 16 13 0e 17 d8 5f |........|\\....._|
|00005000| 16 14 0e 0b 0e 14 5a 0e | 19 5a 16 15 0e 0d 0e 1a |......Z.|.Z......|
|00005010| ab a0 0e 11 1e 1b 0e 1c | ab 8b dd 0e 1b 21 ce 0e |........|.....!..|
|00005020| 1b 21 a5 aa 84 de 0e 1b | 21 29 0e 1f 0e 13 5c 5c |.!......|!)....\\|
|00005030| 5f aa bc 0e 0f 0d 1e 1b | 0e 1c ab 8b dd 0e 1b 21 |_.......|.......!|
|00005040| ce 0e 1b 21 a5 aa 84 de | 0e 1b 21 29 5f 0e 11 1e |...!....|..!)_...|
|00005050| 1b 0e 1c ab 8b dd 0e 1b | 21 ce 0e 1b 21 a5 aa 84 |........|!...!...|
|00005060| de 0e 1b 21 29 0e 20 0e | 21 5c 5c 0e 13 5c 5c 5f |...!). .|!\\..\\_|
|00005070| 5a 5c 5c 16 16 0e 15 e2 | 20 0e 23 89 5c 5c 0e 11 |Z\\.....| .#.\\..|
|00005080| 1e 1b 0e 1c ab 8a e4 0e | 25 e6 0e 1b 21 5c 22 aa |........|%...!\".|
|00005090| 84 e7 0e 1b 21 29 5f 5a | 5e 16 15 0e 16 e8 20 0e |....!)_Z|^..... .|
|000050a0| 20 0e 11 1e 1b 0e 1c ab | 8b dd 0e 1b 21 ce 0e 1b | .......|....!...|
|000050b0| 21 a5 aa 84 de 0e 1b 21 | 29 5f 5a 5e 16 16 0e 15 |!......!|)_Z^....|
|000050c0| e9 5d 16 15 0e 16 e9 5d | 16 16 ca 0e 15 42 cc 0e |.].....]|.....B..|
|000050d0| 16 2e 0b 42 44 87 0e 2a | eb 61 ae 84 ec 0e 2d 21 |...BD..*|.a....-!|
|000050e0| 87 22 20 5b 63 74 6c 2d | 62 75 66 66 65 72 20 67 |." [ctl-|buffer g|
|000050f0| 65 74 2d 62 75 66 66 65 | 72 20 62 75 66 66 65 72 |et-buffe|r buffer|
|00005100| 2d 6e 61 6d 65 20 77 69 | 6e 64 6f 77 2d 66 72 61 |-name wi|ndow-fra|
|00005110| 6d 65 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 2d |me ediff|-window-|
|00005120| 41 20 66 72 61 6d 65 2d | 41 20 66 72 61 6d 65 2d |A frame-|A frame-|
|00005130| 70 61 72 61 6d 65 74 65 | 72 73 20 66 72 61 6d 65 |paramete|rs frame|
|00005140| 2d 41 2d 70 61 72 61 6d | 65 74 65 72 73 20 65 76 |-A-param|eters ev|
|00005150| 61 6c 20 61 73 73 6f 63 | 20 74 6f 70 20 66 72 61 |al assoc| top fra|
|00005160| 6d 65 2d 41 2d 74 6f 70 | 20 6c 65 66 74 20 66 72 |me-A-top| left fr|
|00005170| 61 6d 65 2d 41 2d 6c 65 | 66 74 20 66 72 61 6d 65 |ame-A-le|ft frame|
|00005180| 2d 77 69 64 74 68 20 66 | 72 61 6d 65 2d 41 2d 77 |-width f|rame-A-w|
|00005190| 69 64 74 68 20 65 64 69 | 66 66 2d 63 6f 6e 74 72 |idth edi|ff-contr|
|000051a0| 6f 6c 2d 66 72 61 6d 65 | 20 63 74 6c 2d 66 72 61 |ol-frame| ctl-fra|
|000051b0| 6d 65 20 6e 69 6c 20 68 | 6f 72 69 7a 6f 6e 74 61 |me nil h|orizonta|
|000051c0| 6c 2d 61 64 6a 75 73 74 | 6d 65 6e 74 20 75 70 77 |l-adjust|ment upw|
|000051d0| 61 72 64 2d 61 64 6a 75 | 73 74 6d 65 6e 74 20 63 |ard-adju|stment c|
|000051e0| 74 6c 2d 66 72 61 6d 65 | 2d 74 6f 70 20 63 74 6c |tl-frame|-top ctl|
|000051f0| 2d 66 72 61 6d 65 2d 6c | 65 66 74 20 65 64 69 66 |-frame-l|eft edif|
|00005200| 66 2d 63 6f 6e 74 72 6f | 6c 2d 62 75 66 66 65 72 |f-contro|l-buffer|
|00005210| 2d 6e 75 6d 62 65 72 20 | 2d 31 34 20 65 64 69 66 |-number |-14 edif|
|00005220| 66 2d 63 6f 6e 74 72 6f | 6c 2d 66 72 61 6d 65 2d |f-contro|l-frame-|
|00005230| 75 70 77 61 72 64 2d 73 | 68 69 66 74 20 65 64 69 |upward-s|hift edi|
|00005240| 66 66 2d 75 73 65 2d 6c | 6f 6e 67 2d 68 65 6c 70 |ff-use-l|ong-help|
|00005250| 2d 6d 65 73 73 61 67 65 | 20 66 72 61 6d 65 20 65 |-message| frame e|
|00005260| 64 69 66 66 2d 78 65 6d | 61 63 73 2d 70 20 66 72 |diff-xem|acs-p fr|
|00005270| 61 6d 65 2d 70 69 78 65 | 6c 2d 77 69 64 74 68 20 |ame-pixe|l-width |
|00005280| 66 72 61 6d 65 2d 63 68 | 61 72 2d 77 69 64 74 68 |frame-ch|ar-width|
|00005290| 20 65 64 69 66 66 2d 77 | 69 64 65 2d 63 6f 6e 74 | ediff-w|ide-cont|
|000052a0| 72 6f 6c 2d 66 72 61 6d | 65 2d 72 69 67 68 74 77 |rol-fram|e-rightw|
|000052b0| 61 72 64 2d 73 68 69 66 | 74 20 63 74 6c 2d 66 72 |ard-shif|t ctl-fr|
|000052c0| 61 6d 65 2d 77 69 64 74 | 68 20 65 64 69 66 66 2d |ame-widt|h ediff-|
|000052d0| 6e 61 72 72 6f 77 2d 63 | 6f 6e 74 72 6f 6c 2d 66 |narrow-c|ontrol-f|
|000052e0| 72 61 6d 65 2d 6c 65 66 | 74 77 61 72 64 2d 73 68 |rame-lef|tward-sh|
|000052f0| 69 66 74 20 65 64 69 66 | 66 2d 64 69 73 70 6c 61 |ift edif|f-displa|
|00005300| 79 2d 70 69 78 65 6c 2d | 68 65 69 67 68 74 20 63 |y-pixel-|height c|
|00005310| 74 6c 2d 66 72 61 6d 65 | 2d 68 65 69 67 68 74 20 |tl-frame|-height |
|00005320| 67 6c 79 70 68 2d 68 65 | 69 67 68 74 20 65 64 69 |glyph-he|ight edi|
|00005330| 66 66 2d 48 2d 67 6c 79 | 70 68 20 73 65 6c 65 63 |ff-H-gly|ph selec|
|00005340| 74 65 64 2d 77 69 6e 64 | 6f 77 20 66 72 61 6d 65 |ted-wind|ow frame|
|00005350| 2d 63 68 61 72 2d 68 65 | 69 67 68 74 20 65 64 69 |-char-he|ight edi|
|00005360| 66 66 2d 64 69 73 70 6c | 61 79 2d 70 69 78 65 6c |ff-displ|ay-pixel|
|00005370| 2d 77 69 64 74 68 20 31 | 20 74 68 69 73 2d 63 6f |-width 1| this-co|
|00005380| 6d 6d 61 6e 64 20 65 64 | 69 66 66 2d 71 75 69 74 |mmand ed|iff-quit|
|00005390| 20 65 72 72 6f 72 20 65 | 64 69 66 66 2d 4b 49 4c | error e|diff-KIL|
|000053a0| 4c 45 44 2d 56 49 54 41 | 4c 2d 42 55 46 46 45 52 |LED-VITA|L-BUFFER|
|000053b0| 5d 20 37 5d 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |] 7]).(d|efalias |
|000053c0| 27 65 64 69 66 66 2d 78 | 65 6d 61 63 73 2d 73 65 |'ediff-x|emacs-se|
|000053d0| 6c 65 63 74 2d 66 72 61 | 6d 65 2d 68 6f 6f 6b 20 |lect-fra|me-hook |
|000053e0| 23 5b 6e 69 6c 20 22 c0 | 20 09 6b ad 87 5c 6e 3f |#[nil ".| .k..\n?|
|000053f0| ad 83 c3 09 21 87 22 20 | 5b 73 65 6c 65 63 74 65 |....!." |[selecte|
|00005400| 64 2d 66 72 61 6d 65 20 | 65 64 69 66 66 2d 63 6f |d-frame |ediff-co|
|00005410| 6e 74 72 6f 6c 2d 66 72 | 61 6d 65 20 65 64 69 66 |ntrol-fr|ame edif|
|00005420| 66 2d 75 73 65 2d 6c 6f | 6e 67 2d 68 65 6c 70 2d |f-use-lo|ng-help-|
|00005430| 6d 65 73 73 61 67 65 20 | 72 61 69 73 65 2d 66 72 |message |raise-fr|
|00005440| 61 6d 65 5d 20 32 5d 29 | 0a 23 40 33 32 36 20 43 |ame] 2])|.#@326 C|
|00005450| 6f 6e 73 74 72 75 63 74 | 20 61 6e 20 61 6c 69 73 |onstruct| an alis|
|00005460| 74 20 6f 66 20 70 61 72 | 61 6d 65 74 65 72 73 20 |t of par|ameters |
|00005470| 66 6f 72 20 74 68 65 20 | 77 69 64 65 20 64 69 73 |for the |wide dis|
|00005480| 70 6c 61 79 2e 0a 53 61 | 76 65 73 20 74 68 65 20 |play..Sa|ves the |
|00005490| 6f 6c 64 20 66 72 61 6d | 65 20 70 61 72 61 6d 65 |old fram|e parame|
|000054a0| 74 65 72 73 20 69 6e 20 | 60 65 64 69 66 66 2d 77 |ters in |`ediff-w|
|000054b0| 69 64 65 2d 64 69 73 70 | 6c 61 79 2d 6f 72 69 67 |ide-disp|lay-orig|
|000054c0| 2d 70 61 72 61 6d 65 74 | 65 72 73 27 2e 0a 54 68 |-paramet|ers'..Th|
|000054d0| 65 20 66 72 61 6d 65 20 | 74 6f 20 62 65 20 72 65 |e frame |to be re|
|000054e0| 73 69 7a 65 64 20 69 73 | 20 6b 65 70 74 20 69 6e |sized is| kept in|
|000054f0| 20 60 65 64 69 66 66 2d | 77 69 64 65 2d 64 69 73 | `ediff-|wide-dis|
|00005500| 70 6c 61 79 2d 66 72 61 | 6d 65 27 2e 0a 54 68 69 |play-fra|me'..Thi|
|00005510| 73 20 66 75 6e 63 74 69 | 6f 6e 20 6d 6f 64 69 66 |s functi|on modif|
|00005520| 69 65 73 20 6f 6e 6c 79 | 20 74 68 65 20 6c 65 66 |ies only| the lef|
|00005530| 74 20 6d 61 72 67 69 6e | 20 61 6e 64 20 74 68 65 |t margin| and the|
|00005540| 20 77 69 64 74 68 20 6f | 66 20 74 68 65 20 64 69 | width o|f the di|
|00005550| 73 70 6c 61 79 2e 0a 49 | 74 20 61 73 73 75 6d 65 |splay..I|t assume|
|00005560| 73 20 74 68 61 74 20 69 | 74 20 69 73 20 63 61 6c |s that i|t is cal|
|00005570| 6c 65 64 20 66 72 6f 6d | 20 77 69 74 68 69 6e 20 |led from| within |
|00005580| 74 68 65 20 63 6f 6e 74 | 72 6f 6c 20 62 75 66 66 |the cont|rol buff|
|00005590| 65 72 2e 1f 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |er...(de|falias '|
|000055a0| 65 64 69 66 66 2d 6d 61 | 6b 65 2d 77 69 64 65 2d |ediff-ma|ke-wide-|
|000055b0| 64 69 73 70 6c 61 79 20 | 23 5b 6e 69 6c 20 22 c0 |display |#[nil ".|
|000055c0| c1 21 ac 84 c2 c3 21 88 | c4 0d 21 1e 06 c7 0e 06 |.!....!.|..!.....|
|000055d0| 21 1e 08 0e 06 1e 09 0e | 5c 6e ab 8b cb 0e 09 21 |!.......|\n.....!|
|000055e0| cc 0e 09 21 a5 aa 84 cd | 0e 09 21 29 1e 0e c1 20 |...!....|..!)... |
|000055f0| 0e 0e a5 cf 5a 1e 10 d1 | d2 d3 d4 d1 0e 08 5c 22 |....Z...|......\"|
|00005600| 41 21 5d 42 d5 d4 d5 0e | 08 5c 22 41 42 44 16 16 |A!]B....|.\"ABD..|
|00005610| 0e 06 16 17 d8 0e 06 d1 | 0e 0e 42 d5 0e 10 42 44 |........|..B...BD|
|00005620| 5c 22 2c 87 22 20 5b 66 | 62 6f 75 6e 64 70 20 65 |\",." [f|boundp e|
|00005630| 64 69 66 66 2d 64 69 73 | 70 6c 61 79 2d 70 69 78 |diff-dis|play-pix|
|00005640| 65 6c 2d 77 69 64 74 68 | 20 65 72 72 6f 72 20 22 |el-width| error "|
|00005650| 43 61 6e 27 74 20 64 65 | 74 65 72 6d 69 6e 65 20 |Can't de|termine |
|00005660| 64 69 73 70 6c 61 79 20 | 77 69 64 74 68 2e 22 20 |display |width." |
|00005670| 77 69 6e 64 6f 77 2d 66 | 72 61 6d 65 20 65 64 69 |window-f|rame edi|
|00005680| 66 66 2d 77 69 6e 64 6f | 77 2d 41 20 66 72 61 6d |ff-windo|w-A fram|
|00005690| 65 2d 41 20 66 72 61 6d | 65 2d 70 61 72 61 6d 65 |e-A fram|e-parame|
|000056a0| 74 65 72 73 20 66 72 61 | 6d 65 2d 41 2d 70 61 72 |ters fra|me-A-par|
|000056b0| 61 6d 73 20 66 72 61 6d | 65 20 65 64 69 66 66 2d |ams fram|e ediff-|
|000056c0| 78 65 6d 61 63 73 2d 70 | 20 66 72 61 6d 65 2d 70 |xemacs-p| frame-p|
|000056d0| 69 78 65 6c 2d 77 69 64 | 74 68 20 66 72 61 6d 65 |ixel-wid|th frame|
|000056e0| 2d 77 69 64 74 68 20 66 | 72 61 6d 65 2d 63 68 61 |-width f|rame-cha|
|000056f0| 72 2d 77 69 64 74 68 20 | 63 77 20 35 20 77 64 20 |r-width |cw 5 wd |
|00005700| 6c 65 66 74 20 30 20 65 | 76 61 6c 20 61 73 73 6f |left 0 e|val asso|
|00005710| 63 20 77 69 64 74 68 20 | 65 64 69 66 66 2d 77 69 |c width |ediff-wi|
|00005720| 64 65 2d 64 69 73 70 6c | 61 79 2d 6f 72 69 67 2d |de-displ|ay-orig-|
|00005730| 70 61 72 61 6d 65 74 65 | 72 73 20 65 64 69 66 66 |paramete|rs ediff|
|00005740| 2d 77 69 64 65 2d 64 69 | 73 70 6c 61 79 2d 66 72 |-wide-di|splay-fr|
|00005750| 61 6d 65 20 6d 6f 64 69 | 66 79 2d 66 72 61 6d 65 |ame modi|fy-frame|
|00005760| 2d 70 61 72 61 6d 65 74 | 65 72 73 5d 20 36 20 28 |-paramet|ers] 6 (|
|00005770| 23 24 20 2e 20 32 31 35 | 38 33 29 5d 29 0a 28 64 |#$ . 215|83)]).(d|
|00005780| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 72 |efalias |'ediff-r|
|00005790| 65 66 72 65 73 68 2d 6d | 6f 64 65 2d 6c 69 6e 65 |efresh-m|ode-line|
|000057a0| 73 20 23 5b 6e 69 6c 20 | 22 c0 89 89 89 19 1a 1b |s #[nil |".......|
|000057b0| 1c c0 1d 0e 06 89 15 c7 | 59 ad 84 0d 0e 08 57 29 |........|Y.....W)|
|000057c0| 83 f3 00 0e 09 ad a3 ca | 0e 09 21 ad 9d cb ca 0e |........|..!.....|
|000057d0| 09 21 21 ad 95 cc 0e 0d | 1e 0e 1e 0f d0 0e 0f 0e |.!!.....|........|
|000057e0| 0e 5c 22 41 2a 4a 0e 06 | 48 d1 48 12 0e 12 ad 87 |.\"A*J..|H.H.....|
|000057f0| 0e 12 0e 06 48 c7 48 11 | 0e 09 ad a3 ca 0e 09 21 |....H.H.|.......!|
|00005800| ad 9d cb ca 0e 09 21 21 | ad 95 d3 0e 0d 1e 0e 1e |......!!|........|
|00005810| 0f d0 0e 0f 0e 0e 5c 22 | 41 2a 4a 0e 06 48 d1 48 |......\"|A*J..H.H|
|00005820| 14 0e 09 ad a3 ca 0e 09 | 21 ad 9d cb ca 0e 09 21 |........|!......!|
|00005830| 21 ad 95 d4 0e 0d 1e 0e | 1e 0f d0 0e 0f 0e 0e 5c |!.......|.......\|
|00005840| 22 41 2a 4a 0e 06 48 d1 | 48 13 0c ab 86 d5 d6 0c |"A*J..H.|H.......|
|00005850| 5c 22 aa 81 d7 14 0b ab | 86 d5 d6 0b 5c 22 aa 81 |\"......|....\"..|
|00005860| d7 13 0e 09 ab b7 ca 0e | 09 21 ab b1 cb ca 0e 09 |........|.!......|
|00005870| 21 21 ab a9 5c 6e ac 83 | 09 ab a3 d5 d8 5c 6e ae |!!..\n..|.....\n.|
|00005880| 81 d7 09 ab 85 d9 09 50 | aa 81 d7 0e 12 ab 8c 0e |.......P|........|
|00005890| 12 0e 06 48 da 48 ab 83 | db aa 81 d7 24 aa 81 d7 |...H.H..|....$...|
|000058a0| 12 aa 86 d7 14 d7 13 d7 | 12 dc 20 ab 91 0e 1d ab |........|.. .....|
|000058b0| 8d 0e 1e 0e 1f 6b ab 86 | e0 0e 21 44 aa 85 e2 0e |.....k..|..!D....|
|000058c0| 21 e3 45 16 24 dc 20 ab | 90 0e 1d ab 8c 0e 1e 0e |!.E.$. .|........|
|000058d0| 1f 6b ab 85 e5 e6 21 aa | 82 e7 20 16 21 e8 20 88 |.k....!.|.. .!. .|
|000058e0| dc 20 ab 89 e9 0e 2a 21 | ab 83 eb 20 88 0e 2c ab |. ....*!|... ..,.|
|000058f0| b0 ca 0e 2c 21 ab aa cb | ca 0e 2c 21 21 ab a2 72 |...,!...|..,!!..r|
|00005900| 0e 2c 71 88 0c 16 2d 0e | 24 40 ee b6 ab 86 ef 0e |.,q...-.|$@......|
|00005910| 24 38 16 24 f0 ed 0e 24 | 45 16 24 e8 20 88 29 aa |$8.$...$|E.$. .).|
|00005920| 8b 0e 31 f2 61 ac 85 f3 | 0e 34 21 88 0e 35 ab b0 |..1.a...|.4!..5..|
|00005930| ca 0e 35 21 ab aa cb ca | 0e 35 21 21 ab a2 72 0e |..5!....|.5!!..r.|
|00005940| 35 71 88 0b 16 2d 0e 24 | 40 ee b6 ab 86 ef 0e 24 |5q...-.$|@......$|
|00005950| 38 16 24 f6 ed 0e 24 45 | 16 24 e8 20 88 29 aa 8b |8.$...$E|.$. .)..|
|00005960| 0e 31 f2 61 ac 85 f3 0e | 34 21 88 0e 37 ab bf 0e |.1.a....|4!..7...|
|00005970| 09 ab b0 ca 0e 09 21 ab | aa cb ca 0e 09 21 21 ab |......!.|.....!!.|
|00005980| a2 72 0e 09 71 88 5c 6e | 16 2d 0e 24 40 ee b6 ab |.r..q.\n|.-.$@...|
|00005990| 86 ef 0e 24 38 16 24 f8 | ed 0e 24 45 16 24 e8 20 |...$8.$.|..$E.$. |
|000059a0| 88 29 aa 8b 0e 31 f2 61 | ac 85 f3 0e 34 21 88 0e |.)...1.a|....4!..|
|000059b0| 39 ad e0 ca 0e 39 21 ad | da cb ca 0e 39 21 21 ad |9....9!.|....9!!.|
|000059c0| d2 0e 39 ab c4 ca 0e 39 | 21 ab be cb ca 0e 39 21 |..9....9|!.....9!|
|000059d0| 21 ab b6 72 0e 39 71 88 | 0e 24 40 ee b6 ab 86 ef |!..r.9q.|.$@.....|
|000059e0| 0e 24 38 16 24 fa 09 3b | ac 83 d7 aa 93 fb fc 09 |.$8.$..;|........|
|000059f0| 5c 22 ab 83 fd aa 8a fb | fe 09 5c 22 ab 83 ff aa |\"......|..\"....|
|00005a00| 81 d7 0e 24 45 89 16 24 | 29 aa 8a 0e 31 f2 61 ae |...$E..$|)...1.a.|
|00005a10| 84 f3 0e 34 21 2c 87 22 | 20 5b 6e 69 6c 20 62 75 |...4!,."| [nil bu|
|00005a20| 66 2d 43 2d 73 74 61 74 | 65 2d 6d 65 72 67 65 20 |f-C-stat|e-merge |
|00005a30| 62 75 66 2d 43 2d 73 74 | 61 74 65 2d 64 69 66 66 |buf-C-st|ate-diff|
|00005a40| 20 62 75 66 2d 42 2d 73 | 74 61 74 65 2d 64 69 66 | buf-B-s|tate-dif|
|00005a50| 66 20 62 75 66 2d 41 2d | 73 74 61 74 65 2d 64 69 |f buf-A-|state-di|
|00005a60| 66 66 20 6e 20 65 64 69 | 66 66 2d 63 75 72 72 65 |ff n edi|ff-curre|
|00005a70| 6e 74 2d 64 69 66 66 65 | 72 65 6e 63 65 20 30 20 |nt-diffe|rence 0 |
|00005a80| 65 64 69 66 66 2d 6e 75 | 6d 62 65 72 2d 6f 66 2d |ediff-nu|mber-of-|
|00005a90| 64 69 66 66 65 72 65 6e | 63 65 73 20 65 64 69 66 |differen|ces edif|
|00005aa0| 66 2d 62 75 66 66 65 72 | 2d 43 20 67 65 74 2d 62 |f-buffer|-C get-b|
|00005ab0| 75 66 66 65 72 20 62 75 | 66 66 65 72 2d 6e 61 6d |uffer bu|ffer-nam|
|00005ac0| 65 20 43 20 65 64 69 66 | 66 2d 64 69 66 66 65 72 |e C edif|f-differ|
|00005ad0| 65 6e 63 65 2d 76 65 63 | 74 6f 72 2d 61 6c 69 73 |ence-vec|tor-alis|
|00005ae0| 74 20 61 6c 69 73 74 20 | 62 75 66 2d 74 79 70 65 |t alist |buf-type|
|00005af0| 20 61 73 73 6f 63 20 33 | 20 65 64 69 66 66 2d 73 | assoc 3| ediff-s|
|00005b00| 74 61 74 65 2d 6f 66 2d | 6d 65 72 67 65 20 41 20 |tate-of-|merge A |
|00005b10| 42 20 66 6f 72 6d 61 74 | 20 22 5b 25 73 5d 20 22 |B format| "[%s] "|
|00005b20| 20 22 22 20 22 5b 25 73 | 25 73 25 73 5d 20 22 20 | "" "[%s|%s%s] " |
|00005b30| 22 20 22 20 31 20 22 20 | 41 6e 63 65 73 74 6f 72 |" " 1 " |Ancestor|
|00005b40| 45 6d 70 74 79 22 20 65 | 64 69 66 66 2d 77 69 6e |Empty" e|diff-win|
|00005b50| 64 6f 77 2d 64 69 73 70 | 6c 61 79 2d 70 20 65 64 |dow-disp|lay-p ed|
|00005b60| 69 66 66 2d 6d 75 6c 74 | 69 66 72 61 6d 65 20 65 |iff-mult|iframe e|
|00005b70| 64 69 66 66 2d 68 65 6c | 70 2d 6d 65 73 73 61 67 |diff-hel|p-messag|
|00005b80| 65 20 65 64 69 66 66 2d | 62 72 69 65 66 2d 6d 65 |e ediff-|brief-me|
|00005b90| 73 73 61 67 65 2d 73 74 | 72 69 6e 67 20 22 20 20 |ssage-st|ring "  |
|00005ba0| 20 22 20 6d 6f 64 65 2d | 6c 69 6e 65 2d 62 75 66 | " mode-|line-buf|
|00005bb0| 66 65 72 2d 69 64 65 6e | 74 69 66 69 63 61 74 69 |fer-iden|tificati|
|00005bc0| 6f 6e 20 22 2d 2d 20 22 | 20 22 20 20 20 20 20 20 |on "-- "| "      |
|00005bd0| 20 20 51 75 69 63 6b 20 | 48 65 6c 70 22 20 6d 6f |  Quick |Help" mo|
|00005be0| 64 65 2d 6c 69 6e 65 2d | 66 6f 72 6d 61 74 20 65 |de-line-|format e|
|00005bf0| 64 69 66 66 2d 6d 61 6b | 65 2d 6e 61 72 72 6f 77 |diff-mak|e-narrow|
|00005c00| 2d 63 6f 6e 74 72 6f 6c | 2d 62 75 66 66 65 72 2d |-control|-buffer-|
|00005c10| 69 64 20 73 6b 69 70 2d | 6e 61 6d 65 20 65 64 69 |id skip-|name edi|
|00005c20| 66 66 2d 6d 61 6b 65 2d | 77 69 64 65 2d 63 6f 6e |ff-make-|wide-con|
|00005c30| 74 72 6f 6c 2d 62 75 66 | 66 65 72 2d 69 64 20 66 |trol-buf|fer-id f|
|00005c40| 6f 72 63 65 2d 6d 6f 64 | 65 2d 6c 69 6e 65 2d 75 |orce-mod|e-line-u|
|00005c50| 70 64 61 74 65 20 66 72 | 61 6d 65 2d 6c 69 76 65 |pdate fr|ame-live|
|00005c60| 2d 70 20 65 64 69 66 66 | 2d 63 6f 6e 74 72 6f 6c |-p ediff|-control|
|00005c70| 2d 66 72 61 6d 65 20 65 | 64 69 66 66 2d 72 65 66 |-frame e|diff-ref|
|00005c80| 72 65 73 68 2d 63 6f 6e | 74 72 6f 6c 2d 66 72 61 |resh-con|trol-fra|
|00005c90| 6d 65 20 65 64 69 66 66 | 2d 62 75 66 66 65 72 2d |me ediff|-buffer-|
|00005ca0| 41 20 65 64 69 66 66 2d | 64 69 66 66 2d 73 74 61 |A ediff-|diff-sta|
|00005cb0| 74 75 73 20 28 22 20 41 | 3a 20 22 20 22 20 42 3a |tus (" A|: " " B:|
|00005cc0| 20 22 20 22 20 43 3a 20 | 22 20 22 20 41 6e 63 65 | " " C: |" " Ance|
|00005cd0| 73 74 6f 72 3a 20 22 29 | 20 32 20 22 20 41 3a 20 |stor: ")| 2 " A: |
|00005ce0| 22 20 74 68 69 73 2d 63 | 6f 6d 6d 61 6e 64 20 65 |" this-c|ommand e|
|00005cf0| 64 69 66 66 2d 71 75 69 | 74 20 65 72 72 6f 72 20 |diff-qui|t error |
|00005d00| 65 64 69 66 66 2d 4b 49 | 4c 4c 45 44 2d 56 49 54 |ediff-KI|LLED-VIT|
|00005d10| 41 4c 2d 42 55 46 46 45 | 52 20 65 64 69 66 66 2d |AL-BUFFE|R ediff-|
|00005d20| 62 75 66 66 65 72 2d 42 | 20 22 20 42 3a 20 22 20 |buffer-B| " B: " |
|00005d30| 65 64 69 66 66 2d 33 77 | 61 79 2d 6a 6f 62 20 22 |ediff-3w|ay-job "|
|00005d40| 20 43 3a 20 22 20 65 64 | 69 66 66 2d 61 6e 63 65 | C: " ed|iff-ance|
|00005d50| 73 74 6f 72 2d 62 75 66 | 66 65 72 20 22 20 41 6e |stor-buf|fer " An|
|00005d60| 63 65 73 74 6f 72 3a 20 | 22 20 73 74 72 69 6e 67 |cestor: |" string|
|00005d70| 2d 6d 61 74 63 68 20 22 | 70 72 65 66 65 72 2d 41 |-match "|prefer-A|
|00005d80| 22 20 22 5b 3d 64 69 66 | 66 28 42 29 5d 20 22 20 |" "[=dif|f(B)] " |
|00005d90| 22 70 72 65 66 65 72 2d | 42 22 20 22 5b 3d 64 69 |"prefer-|B" "[=di|
|00005da0| 66 66 28 41 29 5d 20 22 | 5d 20 37 5d 29 0a 28 64 |ff(A)] "|] 7]).(d|
|00005db0| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 72 |efalias |'ediff-r|
|00005dc0| 65 66 72 65 73 68 2d 63 | 6f 6e 74 72 6f 6c 2d 66 |efresh-c|ontrol-f|
|00005dd0| 72 61 6d 65 20 23 5b 6e | 69 6c 20 22 08 ab 8d c1 |rame #[n|il "....|
|00005de0| 5c 6e c3 c4 20 42 c5 c6 | 20 42 44 5c 22 87 c4 20 |\n.. B..| BD\".. |
|00005df0| 16 07 c6 20 16 08 c1 5c | 6e c9 5c 22 87 22 20 5b |... ...\|n.\"." [|
|00005e00| 65 64 69 66 66 2d 65 6d | 61 63 73 2d 70 20 6d 6f |ediff-em|acs-p mo|
|00005e10| 64 69 66 79 2d 66 72 61 | 6d 65 2d 70 61 72 61 6d |dify-fra|me-param|
|00005e20| 65 74 65 72 73 20 65 64 | 69 66 66 2d 63 6f 6e 74 |eters ed|iff-cont|
|00005e30| 72 6f 6c 2d 66 72 61 6d | 65 20 74 69 74 6c 65 20 |rol-fram|e title |
|00005e40| 65 64 69 66 66 2d 6d 61 | 6b 65 2d 62 61 73 65 2d |ediff-ma|ke-base-|
|00005e50| 74 69 74 6c 65 20 69 63 | 6f 6e 2d 6e 61 6d 65 20 |title ic|on-name |
|00005e60| 65 64 69 66 66 2d 6d 61 | 6b 65 2d 6e 61 72 72 6f |ediff-ma|ke-narro|
|00005e70| 77 2d 63 6f 6e 74 72 6f | 6c 2d 62 75 66 66 65 72 |w-contro|l-buffer|
|00005e80| 2d 69 64 20 66 72 61 6d | 65 2d 74 69 74 6c 65 2d |-id fram|e-title-|
|00005e90| 66 6f 72 6d 61 74 20 66 | 72 61 6d 65 2d 69 63 6f |format f|rame-ico|
|00005ea0| 6e 2d 74 69 74 6c 65 2d | 66 6f 72 6d 61 74 20 28 |n-title-|format (|
|00005eb0| 6e 69 6c 29 5d 20 35 5d | 29 0a 28 64 65 66 61 6c |nil)] 5]|).(defal|
|00005ec0| 69 61 73 20 27 65 64 69 | 66 66 2d 6d 61 6b 65 2d |ias 'edi|ff-make-|
|00005ed0| 6e 61 72 72 6f 77 2d 63 | 6f 6e 74 72 6f 6c 2d 62 |narrow-c|ontrol-b|
|00005ee0| 75 66 66 65 72 2d 69 64 | 20 23 5b 28 26 6f 70 74 |uffer-id| #[(&opt|
|00005ef0| 69 6f 6e 61 6c 20 73 6b | 69 70 2d 6e 61 6d 65 29 |ional sk|ip-name)|
|00005f00| 20 22 08 ab 83 c1 aa 82 | c2 20 0b c4 57 ab 87 c5 | "......|. ..W...|
|00005f10| c6 0e 07 5c 22 aa 94 0b | 0e 07 59 ab 87 c5 c8 0e |...\"...|..Y.....|
|00005f20| 07 5c 22 aa 87 c5 c9 0b | 54 0e 07 23 50 87 22 20 |.\".....|T..#P." |
|00005f30| 5b 73 6b 69 70 2d 6e 61 | 6d 65 20 22 20 22 20 65 |[skip-na|me " " e|
|00005f40| 64 69 66 66 2d 6d 61 6b | 65 2d 62 61 73 65 2d 74 |diff-mak|e-base-t|
|00005f50| 69 74 6c 65 20 65 64 69 | 66 66 2d 63 75 72 72 65 |itle edi|ff-curre|
|00005f60| 6e 74 2d 64 69 66 66 65 | 72 65 6e 63 65 20 30 20 |nt-diffe|rence 0 |
|00005f70| 66 6f 72 6d 61 74 20 22 | 20 5f 2f 25 64 22 20 65 |format "| _/%d" e|
|00005f80| 64 69 66 66 2d 6e 75 6d | 62 65 72 2d 6f 66 2d 64 |diff-num|ber-of-d|
|00005f90| 69 66 66 65 72 65 6e 63 | 65 73 20 22 20 24 2f 25 |ifferenc|es " $/%|
|00005fa0| 64 22 20 22 20 25 64 2f | 25 64 22 5d 20 35 5d 29 |d" " %d/|%d"] 5])|
|00005fb0| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00005fc0| 66 2d 6d 61 6b 65 2d 62 | 61 73 65 2d 74 69 74 6c |f-make-b|ase-titl|
|00005fd0| 65 20 23 5b 6e 69 6c 20 | 22 c0 c1 5c 6e 5c 22 41 |e #[nil |"..\n\"A|
|00005fe0| 0b 50 87 22 20 5b 61 73 | 73 6f 63 20 6e 61 6d 65 |.P." [as|soc name|
|00005ff0| 20 65 64 69 66 66 2d 63 | 6f 6e 74 72 6f 6c 2d 66 | ediff-c|ontrol-f|
|00006000| 72 61 6d 65 2d 70 61 72 | 61 6d 65 74 65 72 73 20 |rame-par|ameters |
|00006010| 65 64 69 66 66 2d 63 6f | 6e 74 72 6f 6c 2d 62 75 |ediff-co|ntrol-bu|
|00006020| 66 66 65 72 2d 73 75 66 | 66 69 78 5d 20 33 5d 29 |ffer-suf|fix] 3])|
|00006030| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00006040| 66 2d 6d 61 6b 65 2d 77 | 69 64 65 2d 63 6f 6e 74 |f-make-w|ide-cont|
|00006050| 72 6f 6c 2d 62 75 66 66 | 65 72 2d 69 64 20 23 5b |rol-buff|er-id #[|
|00006060| 6e 69 6c 20 22 08 c1 57 | ab 86 c2 c3 0c 5c 22 43 |nil "..W|.....\"C|
|00006070| 87 08 0c 59 ab 86 c2 c5 | 0c 5c 22 43 87 c2 c6 08 |...Y....|.\"C....|
|00006080| 54 0c 23 43 87 22 20 5b | 65 64 69 66 66 2d 63 75 |T.#C." [|ediff-cu|
|00006090| 72 72 65 6e 74 2d 64 69 | 66 66 65 72 65 6e 63 65 |rrent-di|fference|
|000060a0| 20 30 20 66 6f 72 6d 61 | 74 20 22 25 25 62 20 20 | 0 forma|t "%%b  |
|000060b0| 20 41 74 20 73 74 61 72 | 74 20 6f 66 20 25 64 20 | At star|t of %d |
|000060c0| 64 69 66 66 73 22 20 65 | 64 69 66 66 2d 6e 75 6d |diffs" e|diff-num|
|000060d0| 62 65 72 2d 6f 66 2d 64 | 69 66 66 65 72 65 6e 63 |ber-of-d|ifferenc|
|000060e0| 65 73 20 22 25 25 62 20 | 20 20 41 74 20 65 6e 64 |es "%%b |  At end|
|000060f0| 20 6f 66 20 25 64 20 64 | 69 66 66 73 22 20 22 25 | of %d d|iffs" "%|
|00006100| 25 62 20 20 20 64 69 66 | 66 20 25 64 20 6f 66 20 |%b   dif|f %d of |
|00006110| 25 64 22 5d 20 34 5d 29 | 0a 28 64 65 66 61 6c 69 |%d"] 4])|.(defali|
|00006120| 61 73 20 27 65 64 69 66 | 66 2d 67 65 74 2d 76 69 |as 'edif|f-get-vi|
|00006130| 73 69 62 6c 65 2d 62 75 | 66 66 65 72 2d 77 69 6e |sible-bu|ffer-win|
|00006140| 64 6f 77 20 23 5b 28 62 | 75 66 66 29 20 22 08 ad |dow #[(b|uff) "..|
|00006150| 98 c1 08 21 ad 93 c2 c1 | 08 21 21 ad 8c 0b ab 85 |...!....|.!!.....|
|00006160| c4 08 c5 5c 22 87 c4 08 | c6 5c 22 87 22 20 5b 62 |...\"...|.\"." [b|
|00006170| 75 66 66 20 67 65 74 2d | 62 75 66 66 65 72 20 62 |uff get-|buffer b|
|00006180| 75 66 66 65 72 2d 6e 61 | 6d 65 20 65 64 69 66 66 |uffer-na|me ediff|
|00006190| 2d 78 65 6d 61 63 73 2d | 70 20 67 65 74 2d 62 75 |-xemacs-|p get-bu|
|000061a0| 66 66 65 72 2d 77 69 6e | 64 6f 77 20 74 20 76 69 |ffer-win|dow t vi|
|000061b0| 73 69 62 6c 65 5d 20 33 | 5d 29 0a 28 64 65 66 61 |sible] 3|]).(defa|
|000061c0| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 6b 65 65 70 |lias 'ed|iff-keep|
|000061d0| 2d 77 69 6e 64 6f 77 2d | 63 6f 6e 66 69 67 20 23 |-window-|config #|
|000061e0| 5b 28 63 6f 6e 74 72 6f | 6c 2d 62 75 66 29 20 22 |[(contro|l-buf) "|
|000061f0| 08 70 61 85 c3 00 c1 20 | c2 55 3f 85 c3 00 08 83 |.pa.... |.U?.....|
|00006200| b9 00 c3 08 21 83 b9 00 | c4 c3 08 21 21 83 b9 00 |....!...|...!!...|
|00006210| 72 08 71 88 0d 0e 06 0e | 07 0e 08 1e 09 1e 5c 6e |r.q.....|......\n|
|00006220| 1e 0b 1e 0c 0e 0b 1e 0d | ce 0e 0d 21 ad 8b cf 20 |........|...!... |
|00006230| 3f ae 86 d0 d1 0e 0d 21 | 21 29 ad ec 0e 5c 6e 1e |?......!|!)...\n.|
|00006240| 0d ce 0e 0d 21 ad 8b cf | 20 3f ae 86 d0 d1 0e 0d |....!...| ?......|
|00006250| 21 21 29 ad d4 0e 12 ab | 98 0e 09 1e 0d ce 0e 0d |!!).....|........|
|00006260| 21 ad 8b cf 20 3f ae 86 | d0 d1 0e 0d 21 21 29 ad |!... ?..|....!!).|
|00006270| b8 d3 0e 0b 21 0e 14 61 | ad af d3 0e 5c 6e 21 0e |....!..a|....\n!.|
|00006280| 15 61 ad a6 0e 12 ab 89 | d3 0e 09 21 0e 16 61 ad |.a......|...!..a.|
|00006290| 99 0e 17 d8 d9 0e 0c 0e | 0b 0e 5c 6e 0e 09 0e 1a |........|..\n....|
|000062a0| cf 20 ad 82 0e 1b 0e 1c | 26 08 98 2d 87 0e 1d de |. ......|&..-....|
|000062b0| 61 ae 84 df 0e 20 21 87 | 22 20 5b 63 6f 6e 74 72 |a.... !.|" [contr|
|000062c0| 6f 6c 2d 62 75 66 20 62 | 75 66 66 65 72 2d 73 69 |ol-buf b|uffer-si|
|000062d0| 7a 65 20 30 20 67 65 74 | 2d 62 75 66 66 65 72 20 |ze 0 get|-buffer |
|000062e0| 62 75 66 66 65 72 2d 6e | 61 6d 65 20 65 64 69 66 |buffer-n|ame edif|
|000062f0| 66 2d 63 6f 6e 74 72 6f | 6c 2d 77 69 6e 64 6f 77 |f-contro|l-window|
|00006300| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 2d 41 20 | ediff-w|indow-A |
|00006310| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 2d 42 20 65 |ediff-wi|ndow-B e|
|00006320| 64 69 66 66 2d 77 69 6e | 64 6f 77 2d 43 20 43 2d |diff-win|dow-C C-|
|00006330| 77 69 6e 64 20 42 2d 77 | 69 6e 64 20 41 2d 77 69 |wind B-w|ind A-wi|
|00006340| 6e 64 20 63 74 6c 2d 77 | 69 6e 64 20 77 69 6e 64 |nd ctl-w|ind wind|
|00006350| 20 77 69 6e 64 6f 77 2d | 6c 69 76 65 2d 70 20 65 | window-|live-p e|
|00006360| 64 69 66 66 2d 77 69 6e | 64 6f 77 2d 64 69 73 70 |diff-win|dow-disp|
|00006370| 6c 61 79 2d 70 20 66 72 | 61 6d 65 2d 76 69 73 69 |lay-p fr|ame-visi|
|00006380| 62 6c 65 2d 70 20 77 69 | 6e 64 6f 77 2d 66 72 61 |ble-p wi|ndow-fra|
|00006390| 6d 65 20 65 64 69 66 66 | 2d 33 77 61 79 2d 6a 6f |me ediff|-3way-jo|
|000063a0| 62 20 77 69 6e 64 6f 77 | 2d 62 75 66 66 65 72 20 |b window|-buffer |
|000063b0| 65 64 69 66 66 2d 62 75 | 66 66 65 72 2d 41 20 65 |ediff-bu|ffer-A e|
|000063c0| 64 69 66 66 2d 62 75 66 | 66 65 72 2d 42 20 65 64 |diff-buf|fer-B ed|
|000063d0| 69 66 66 2d 62 75 66 66 | 65 72 2d 43 20 65 64 69 |iff-buff|er-C edi|
|000063e0| 66 66 2d 77 69 6e 64 6f | 77 2d 63 6f 6e 66 69 67 |ff-windo|w-config|
|000063f0| 2d 73 61 76 65 64 20 66 | 6f 72 6d 61 74 20 22 25 |-saved f|ormat "%|
+--------+-------------------------+-------------------------+--------+--------+